diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx
index 379b314c627..c85e413b18a 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataPane.tsx
@@ -143,8 +143,8 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
   const currentTab = tabs.find((t) => t.tabId === tab);
 
   return (
-    <div>
-      <TabsBar hideBorder={true}>
+    <>
+      <TabsBar hideBorder={true} className={styles.tabsBar}>
         {tabs.map((t, index) => {
           return (
             <Tab
@@ -158,12 +158,12 @@ function PanelDataPaneRendered({ model }: SceneComponentProps<PanelDataPane>) {
           );
         })}
       </TabsBar>
-      <TabContent className={styles.tabContent}>
-        <CustomScrollbar autoHeightMin="100%">
+      <CustomScrollbar className={styles.scroll}>
+        <TabContent className={styles.tabContent}>
           <Container>{currentTab && <currentTab.Component model={currentTab} />}</Container>
-        </CustomScrollbar>
-      </TabContent>
-    </div>
+        </TabContent>
+      </CustomScrollbar>
+    </>
   );
 }
 
@@ -175,6 +175,13 @@ function getStyles(theme: GrafanaTheme2) {
       borderLeft: 'none',
       borderBottom: 'none',
       borderTopRightRadius: theme.shape.radius.default,
+      flexGrow: 1,
+    }),
+    tabsBar: css({
+      flexShrink: 0,
+    }),
+    scroll: css({
+      background: theme.colors.background.primary,
     }),
   };
 }
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx b/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
index 0e06197eb0e..1b4542ecdc0 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelEditor.tsx
@@ -126,6 +126,13 @@ export function buildPanelEditScene(panel: VizPanel): PanelEditor {
         secondary: new SceneFlexItem({
           body: new PanelDataPane(vizPanelMgr),
         }),
+        primaryPaneStyles: {
+          minHeight: 0,
+          overflow: 'hidden',
+        },
+        secondaryPaneStyles: {
+          minHeight: 0,
+        },
       }),
       secondary: new SceneFlexItem({
         body: new PanelOptionsPane(vizPanelMgr),