diff --git a/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx b/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx
index e054fed345a..a5b5a9b4ccb 100644
--- a/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldSet.story.tsx
@@ -1,4 +1,4 @@
-import { ComponentMeta } from '@storybook/react';
+import { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import { Input, Form, FieldSet, Field } from '@grafana/ui';
@@ -6,34 +6,41 @@ import { Input, Form, FieldSet, Field } from '@grafana/ui';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { Button } from '../Button';
 
+import { Props } from './FieldSet';
 import mdx from './FieldSet.mdx';
 
 const meta: ComponentMeta<typeof FieldSet> = {
   title: 'Forms/FieldSet',
   component: FieldSet,
   decorators: [withCenteredStory],
+  args: {
+    label: 'Default label',
+  },
   parameters: {
     docs: {
       page: mdx,
     },
+    controls: {
+      exclude: ['children'],
+    },
+  },
+  argTypes: {
+    label: { control: 'text' },
   },
 };
 
-export const basic = () => {
+export const Basic: ComponentStory<typeof FieldSet> = (args: Props) => {
   return (
     <Form onSubmit={() => console.log('Submit')}>
       {() => (
         <>
-          <FieldSet label="Details">
+          <FieldSet {...args}>
             <Field label="Name">
               <Input name="name" />
             </Field>
             <Field label="Email">
               <Input name="email" />
             </Field>
-          </FieldSet>
-
-          <FieldSet label="Preferences">
             <Field label="Color">
               <Input name="color" />
             </Field>