diff --git a/Editor/Toolbar/Tools/ToolUICanvasPicker.cs b/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
index 1a7ca92..bb3cd1a 100644
--- a/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
+++ b/Editor/Toolbar/Tools/ToolUICanvasPicker.cs
@@ -12,7 +12,7 @@ namespace Game.NavigationTool.Editor.Tools
     internal sealed class ToolUICanvasPicker : IToolbarDrawer
     {
         public bool Visible => true;
-        public bool Enabled => !EditorApplication.isPlayingOrWillChangePlaymode;
+        public bool Enabled => (UTools.visibleLayers & (1 << LayerMask.NameToLayer("UI"))) != 0;
         public EToolbarPlacement Placement => EToolbarPlacement.Left;
 
         private static bool IS_DIRTY = true;
diff --git a/Editor/Toolbar/Tools/ToolUILayerToggle.cs b/Editor/Toolbar/Tools/ToolUILayerToggle.cs
index 97fcce3..fab5b35 100644
--- a/Editor/Toolbar/Tools/ToolUILayerToggle.cs
+++ b/Editor/Toolbar/Tools/ToolUILayerToggle.cs
@@ -10,7 +10,7 @@ namespace Game.NavigationTool.Editor.Tools
     internal sealed class ToolUILayerToggle : IToolbarDrawer
     {
         public bool Visible => true;
-        public bool Enabled => !EditorApplication.isPlayingOrWillChangePlaymode;
+        public bool Enabled => true;
         public EToolbarPlacement Placement => EToolbarPlacement.Left;
         
         public void Update()
diff --git a/package.json b/package.json
index 991c728..33758fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.module.navigationtool",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "displayName": "Module.NavigationTool",
   "description": "Support for navigation tools, like favorites, history and toolbars",
   "unity": "2019.2",