diff --git a/e2e/suite1/specs/variables/new-query-variable.ts b/e2e/suite1/specs/variables/new-query-variable.ts
index fa1c090bd33..4f8d4fe32a9 100644
--- a/e2e/suite1/specs/variables/new-query-variable.ts
+++ b/e2e/suite1/specs/variables/new-query-variable.ts
@@ -175,19 +175,11 @@ describe('Variables - Add variable', () => {
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsMultiSwitch()
       .click({ force: true })
-      .within(() => {
-        e2e()
-          .get('input')
-          .should('be.checked');
-      });
+      .should('be.checked');
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsIncludeAllSwitch()
       .click({ force: true })
-      .within(() => {
-        e2e()
-          .get('input')
-          .should('be.checked');
-      });
+      .should('be.checked');
 
     e2e.pages.Dashboard.Settings.Variables.Edit.General.selectionOptionsCustomAllInput().within(input => {
       expect(input.attr('placeholder')).equals('blank = auto');
diff --git a/packages/grafana-ui/src/components/Switch/Switch.story.tsx b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
index 4e7e8525dcc..c00a27e6b7c 100644
--- a/packages/grafana-ui/src/components/Switch/Switch.story.tsx
+++ b/packages/grafana-ui/src/components/Switch/Switch.story.tsx
@@ -25,18 +25,18 @@ export const Controlled = () => {
 
   return (
     <div>
-      <p>
+      <div style={{ marginBottom: '32px' }}>
         <Field label="Normal switch" description="For horizontal forms">
           <Switch value={checked} disabled={disabled} onChange={onChange} />
         </Field>
-      </p>
-      <p>
+      </div>
+      <div style={{ marginBottom: '32px' }}>
         <InlineFieldRow>
           <InlineField label="My switch">
             <InlineSwitch value={checked} disabled={disabled} onChange={onChange} />
           </InlineField>
         </InlineFieldRow>
-      </p>
+      </div>
     </div>
   );
 };