diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/_workspace_panel_wrapper.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/_workspace_panel_wrapper.scss
index e663754707e05..90cc049db96eb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/_workspace_panel_wrapper.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/_workspace_panel_wrapper.scss
@@ -36,3 +36,7 @@
     }
   }
 }
+
+.lnsWorkspacePanelWrapper__toolbar {
+  margin-bottom: $euiSizeS;
+}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
index f21939b3a2895..f6e15002ca66c 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.tsx
@@ -66,8 +66,8 @@ export function WorkspacePanelWrapper({
     [dispatch]
   );
   return (
-    <EuiFlexGroup gutterSize="s" direction="column" alignItems="stretch" responsive={false}>
-      <EuiFlexItem grow={false}>
+    <>
+      <div className="lnsWorkspacePanelWrapper__toolbar">
         <EuiFlexGroup gutterSize="s" direction="row" responsive={false}>
           <EuiFlexItem grow={false}>
             <ChartSwitch
@@ -94,26 +94,24 @@ export function WorkspacePanelWrapper({
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPageContent className="lnsWorkspacePanelWrapper">
-          {(!emptyExpression || title) && (
-            <EuiPageContentHeader
-              className={classNames('lnsWorkspacePanelWrapper__pageContentHeader', {
-                'lnsWorkspacePanelWrapper__pageContentHeader--unsaved': !title,
-              })}
-            >
-              <span data-test-subj="lns_ChartTitle">
-                {title ||
-                  i18n.translate('xpack.lens.chartTitle.unsaved', { defaultMessage: 'Unsaved' })}
-              </span>
-            </EuiPageContentHeader>
-          )}
-          <EuiPageContentBody className="lnsWorkspacePanelWrapper__pageContentBody">
-            {children}
-          </EuiPageContentBody>
-        </EuiPageContent>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+      </div>
+      <EuiPageContent className="lnsWorkspacePanelWrapper">
+        {(!emptyExpression || title) && (
+          <EuiPageContentHeader
+            className={classNames('lnsWorkspacePanelWrapper__pageContentHeader', {
+              'lnsWorkspacePanelWrapper__pageContentHeader--unsaved': !title,
+            })}
+          >
+            <span data-test-subj="lns_ChartTitle">
+              {title ||
+                i18n.translate('xpack.lens.chartTitle.unsaved', { defaultMessage: 'Unsaved' })}
+            </span>
+          </EuiPageContentHeader>
+        )}
+        <EuiPageContentBody className="lnsWorkspacePanelWrapper__pageContentBody">
+          {children}
+        </EuiPageContentBody>
+      </EuiPageContent>
+    </>
   );
 }