From 60d26ac0ce284ea380c8dd048c7bc0a6bd8eb94e Mon Sep 17 00:00:00 2001
From: Levente Balogh <balogh.levente.hu@gmail.com>
Date: Wed, 10 Sep 2025 09:57:07 +0200
Subject: [PATCH] Dashboard Controls: Only render the "stack" if the drop-down
 is menu is visible (#110856)

fix: only show the dashboard controls menu if it has contents
---
 .../dashboard-scene/scene/DashboardControls.tsx      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/DashboardControls.tsx b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
index be1ea0c844d..d8ae6b05b2d 100644
--- a/public/app/features/dashboard-scene/scene/DashboardControls.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
@@ -124,6 +124,10 @@ function DashboardControlsRenderer({ model }: SceneComponentProps<DashboardContr
   const { links, editPanel } = dashboard.useState();
   const styles = useStyles2(getStyles);
   const showDebugger = window.location.search.includes('scene-debugger');
+  const hasControlMenuVariables = sceneGraph
+    .getVariables(dashboard)
+    .useState()
+    .variables.some((v) => v.state.showInControlsMenu === true);
 
   if (!model.hasControls()) {
     // To still have spacing when no controls are rendered
@@ -152,9 +156,11 @@ function DashboardControlsRenderer({ model }: SceneComponentProps<DashboardContr
           <refreshPicker.Component model={refreshPicker} />
         </Stack>
       )}
-      <Stack>
-        <DropdownVariableControls dashboard={dashboard} />
-      </Stack>
+      {hasControlMenuVariables && (
+        <Stack>
+          <DropdownVariableControls dashboard={dashboard} />
+        </Stack>
+      )}
       {showDebugger && <SceneDebugger scene={model} key={'scene-debugger'} />}
     </div>
   );