diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index 0db06d31aff..d16e63f89db 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -91,6 +91,8 @@ export class Scene {
         // If editing is enabled, clear selecto instance
         const destroySelecto = enableEditing;
         this.initMoveable(destroySelecto, enableEditing);
+        this.currentLayer = this.root;
+        this.selection.next([]);
       }
     }, 100);
     return this.root;