diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
index cbf84c9fd1d..291fa71d981 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManagerRenderer.tsx
@@ -67,12 +67,20 @@ export function TabsLayoutManagerRenderer({ model }: SceneComponentProps<TabsLay
         </DragDropContext>
       </TabsBar>
 
-      <div className={conditionalRenderingClass}>
+      {isEditing && (
+        <div className={conditionalRenderingClass}>
+          <TabContent className={styles.tabContentContainer}>
+            {currentTab && <layout.Component model={layout} />}
+          </TabContent>
+          {conditionalRenderingOverlay}
+        </div>
+      )}
+
+      {!isEditing && (
         <TabContent className={styles.tabContentContainer}>
           {currentTab && <layout.Component model={layout} />}
         </TabContent>
-        {isEditing && conditionalRenderingOverlay}
-      </div>
+      )}
     </div>
   );
 }