From bf042afa9878fcbe91a14da88fb6373f0946c0eb Mon Sep 17 00:00:00 2001
From: Bogdan Matei <bogdan.matei@grafana.com>
Date: Fri, 5 Dec 2025 17:12:12 +0200
Subject: [PATCH] Dashboard: Fix dropping panels in tabs and rows (#114893)

---
 .../dashboard-scene/scene/layout-rows/RowItemRenderer.tsx      | 3 ++-
 .../dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowItemRenderer.tsx
index 4c74ee35d99..80c16b2f2a1 100644
--- a/public/app/features/dashboard-scene/scene/layout-rows/RowItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItemRenderer.tsx
@@ -13,6 +13,7 @@ import { isRepeatCloneOrChildOf } from '../../utils/clone';
 import { useDashboardState, useInterpolatedTitle } from '../../utils/utils';
 import { DashboardScene } from '../DashboardScene';
 import { useSoloPanelContext } from '../SoloPanelContext';
+import { isDashboardLayoutGrid } from '../types/DashboardLayoutGrid';
 
 import { RowItem } from './RowItem';
 
@@ -83,7 +84,7 @@ export function RowItemRenderer({ model }: SceneComponentProps<RowItem>) {
             dragProvided.innerRef(ref);
             model.containerRef.current = ref;
           }}
-          data-dashboard-drop-target-key={model.state.key}
+          data-dashboard-drop-target-key={isDashboardLayoutGrid(layout) ? model.state.key : undefined}
           className={cx(
             styles.wrapper,
             !isCollapsed && styles.wrapperNotCollapsed,
diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
index 0fa22e9d305..e618fb21c7e 100644
--- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItemRenderer.tsx
@@ -11,6 +11,7 @@ import { useIsConditionallyHidden } from '../../conditional-rendering/hooks/useI
 import { isRepeatCloneOrChildOf } from '../../utils/clone';
 import { useDashboardState } from '../../utils/utils';
 import { useSoloPanelContext } from '../SoloPanelContext';
+import { isDashboardLayoutGrid } from '../types/DashboardLayoutGrid';
 
 import { TabItem } from './TabItem';
 
@@ -91,7 +92,7 @@ export function TabItemRenderer({ model }: SceneComponentProps<TabItem>) {
               onSelect?.(evt);
             }}
             label={titleInterpolated}
-            data-dashboard-drop-target-key={model.state.key}
+            data-dashboard-drop-target-key={isDashboardLayoutGrid(layout) ? model.state.key : undefined}
             {...titleCollisionProps}
           />
         </div>