diff --git a/Editor/Toolbar/Tools/ToolScenePickerEditorStateChanged.cs b/Editor/Toolbar/Tools/ToolScenePickerEditorStateChanged.cs
index 672dc3e..1a2b9db 100644
--- a/Editor/Toolbar/Tools/ToolScenePickerEditorStateChanged.cs
+++ b/Editor/Toolbar/Tools/ToolScenePickerEditorStateChanged.cs
@@ -12,6 +12,7 @@ namespace Module.NavigationTool.Editor.Toolbar
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
             SceneManager.activeSceneChanged += OnActiveSceneChanged;
             EditorSceneManager.newSceneCreated += OnNewSceneCreated;
+            EditorSceneManager.activeSceneChangedInEditMode += OnActiveSceneChangedInEditMode;
         }
 
         private static void OnPlayModeStateChanged(PlayModeStateChange state)
@@ -24,6 +25,11 @@ namespace Module.NavigationTool.Editor.Toolbar
             ToolScenePicker.SetAsDirty();
         }
 
+        private static void OnActiveSceneChangedInEditMode(Scene from, Scene to)
+        {
+            ToolScenePicker.SetAsDirty();
+        }
+
         private static void OnNewSceneCreated(Scene scene, NewSceneSetup setup, NewSceneMode mode)
         {
             ToolScenePicker.SetAsDirty();
diff --git a/package.json b/package.json
index dadbc57..b26e273 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.module.navigationtool",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "displayName": "Module.NavigationTool",
   "description": "Support for navigation tools, like favorites, history and toolbars",
   "unity": "2019.2",