From d1a40dea5bcca9b3a299a2df42adfd32c366b820 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:31:44 +0200
Subject: [PATCH] [v11.0.x] Fix Canvas crashing in scenes dashboard (#86125)

Fix Canvas crashing in scenes dashboard (#86117)

(cherry picked from commit 6fb13842a5de6dd0cf72dfd15d77bfed81f850e3)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
---
 public/app/plugins/panel/canvas/module.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/canvas/module.tsx b/public/app/plugins/panel/canvas/module.tsx
index 75566872d8b..e6fa75a7256 100644
--- a/public/app/plugins/panel/canvas/module.tsx
+++ b/public/app/plugins/panel/canvas/module.tsx
@@ -66,7 +66,7 @@ export const plugin = new PanelPlugin<Options>(CanvasPanel)
 
     addStandardCanvasEditorOptions(builder);
 
-    if (state) {
+    if (state && state.scene) {
       builder.addNestedOptions(getLayerEditor(state));
 
       const selection = state.selected;