diff --git a/superset-frontend/src/components/FormRow/FormRow.stories.tsx b/superset-frontend/src/components/FormRow/FormRow.stories.tsx
new file mode 100644
index 000000000000..22a2fc5ca444
--- /dev/null
+++ b/superset-frontend/src/components/FormRow/FormRow.stories.tsx
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import TextControl from 'src/explore/components/controls/TextControl';
+import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
+import FormRow from '.';
+
+export default {
+  title: 'FormRow',
+};
+
+export const InteractiveFormRow = ({ isCheckbox, ...rest }: any) => {
+  const control = isCheckbox ? (
+    <CheckboxControl label="Checkbox" />
+  ) : (
+    <TextControl />
+  );
+  return (
+    <div style={{ width: 300 }}>
+      <FormRow {...rest} control={control} isCheckbox={isCheckbox} />
+    </div>
+  );
+};
+
+InteractiveFormRow.args = {
+  label: 'Label',
+  tooltip: 'Tooltip',
+  control: <TextControl />,
+  isCheckbox: false,
+};
+
+InteractiveFormRow.argTypes = {
+  control: {
+    defaultValue: <TextControl />,
+    table: {
+      disable: true,
+    },
+  },
+};
+
+InteractiveFormRow.story = {
+  parameters: {
+    knobs: {
+      disable: true,
+    },
+  },
+};
diff --git a/superset-frontend/spec/javascripts/components/FormRow_spec.jsx b/superset-frontend/src/components/FormRow/FormRow.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/components/FormRow_spec.jsx
rename to superset-frontend/src/components/FormRow/FormRow.test.jsx
diff --git a/superset-frontend/src/components/FormRow.jsx b/superset-frontend/src/components/FormRow/index.jsx
similarity index 100%
rename from superset-frontend/src/components/FormRow.jsx
rename to superset-frontend/src/components/FormRow/index.jsx