From a604602b55fb8655fda9eea7d856d7aa6d17dbaa Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Thu, 6 Mar 2025 06:48:16 -0600
Subject: [PATCH] Scenes: Fix incorrect panel context.app during panel edit
 (#101567)

---
 .../dashboard-scene/scene/setDashboardPanelContext.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
index f4e053f2e0e..81b3cc012c6 100644
--- a/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
+++ b/public/app/features/dashboard-scene/scene/setDashboardPanelContext.ts
@@ -11,7 +11,16 @@ import { getDashboardSceneFor, getPanelIdForVizPanel, getQueryRunnerFor } from '
 import { DashboardScene } from './DashboardScene';
 
 export function setDashboardPanelContext(vizPanel: VizPanel, context: PanelContext) {
-  context.app = CoreApp.Dashboard;
+  const dashboard = getDashboardSceneFor(vizPanel);
+  context.app = dashboard.state.isEditing ? CoreApp.PanelEditor : CoreApp.Dashboard;
+
+  dashboard.subscribeToState((state) => {
+    if (state.isEditing) {
+      context.app = CoreApp.PanelEditor;
+    } else {
+      context.app = CoreApp.Dashboard;
+    }
+  });
 
   context.canAddAnnotations = () => {
     const dashboard = getDashboardSceneFor(vizPanel);