diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 3281d130a..ad7e06ba5 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -479,6 +479,7 @@ namespace FlaxEditor.Viewport
                     {
                         InitFpsCounter();
                         _showFpsButon = ViewWidgetShowMenu.AddButton("FPS Counter", () => ShowFpsCounter = !ShowFpsCounter);
+                        _showFpsButon.CloseMenuOnClick = false;
                     }
                 }
 
diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 8d7039dc6..9cbfce562 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -371,9 +371,11 @@ namespace FlaxEditor.Viewport
             // Show grid widget
             _showGridButton = ViewWidgetShowMenu.AddButton("Grid", () => Grid.Enabled = !Grid.Enabled);
             _showGridButton.Icon = Style.Current.CheckBoxTick;
+            _showGridButton.CloseMenuOnClick = false;
 
             // Show navigation widget
             _showNavigationButton = ViewWidgetShowMenu.AddButton("Navigation", () => ShowNavigation = !ShowNavigation);
+            _showNavigationButton.CloseMenuOnClick = false;
 
             // Create camera widget
             ViewWidgetButtonMenu.AddSeparator();
diff --git a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
index 12371f947..d96d7a8f9 100644
--- a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
@@ -194,16 +194,20 @@ namespace FlaxEditor.Viewport.Previews
             {
                 // Show Bounds
                 _showBoundsButton = ViewWidgetShowMenu.AddButton("Bounds", () => ShowBounds = !ShowBounds);
+                _showBoundsButton.CloseMenuOnClick = false;
 
                 // Show Skeleton
                 _showNodesButton = ViewWidgetShowMenu.AddButton("Skeleton", () => ShowNodes = !ShowNodes);
+                _showNodesButton.CloseMenuOnClick = false;
 
                 // Show Skeleton Names
                 _showNodesNamesButton = ViewWidgetShowMenu.AddButton("Skeleton Names", () => ShowNodesNames = !ShowNodesNames);
+                _showNodesNamesButton.CloseMenuOnClick = false;
 
                 // Show Floor
                 _showFloorButton = ViewWidgetShowMenu.AddButton("Floor", button => ShowFloor = !ShowFloor);
                 _showFloorButton.IndexInParent = 1;
+                _showFloorButton.CloseMenuOnClick = false;
             }
 
             // Enable shadows
diff --git a/Source/Editor/Viewport/Previews/AssetPreview.cs b/Source/Editor/Viewport/Previews/AssetPreview.cs
index 0bcc4e115..0fb274b5d 100644
--- a/Source/Editor/Viewport/Previews/AssetPreview.cs
+++ b/Source/Editor/Viewport/Previews/AssetPreview.cs
@@ -171,6 +171,7 @@ namespace FlaxEditor.Viewport.Previews
                 // Show Default Scene
                 _showDefaultSceneButton = ViewWidgetShowMenu.AddButton("Default Scene", () => ShowDefaultSceneActors = !ShowDefaultSceneActors);
                 _showDefaultSceneButton.Checked = true;
+                _showDefaultSceneButton.CloseMenuOnClick = false;
             }
 
             // Setup preview scene
diff --git a/Source/Editor/Viewport/Previews/ModelPreview.cs b/Source/Editor/Viewport/Previews/ModelPreview.cs
index a0b6d0ca0..a6496aafe 100644
--- a/Source/Editor/Viewport/Previews/ModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/ModelPreview.cs
@@ -199,13 +199,18 @@ namespace FlaxEditor.Viewport.Previews
             if (useWidgets)
             {
                 _showBoundsButton = ViewWidgetShowMenu.AddButton("Bounds", () => ShowBounds = !ShowBounds);
+                _showBoundsButton.CloseMenuOnClick = false;
                 _showNormalsButton = ViewWidgetShowMenu.AddButton("Normals", () => ShowNormals = !ShowNormals);
+                _showNormalsButton.CloseMenuOnClick = false;
                 _showTangentsButton = ViewWidgetShowMenu.AddButton("Tangents", () => ShowTangents = !ShowTangents);
+                _showTangentsButton.CloseMenuOnClick = false;
                 _showBitangentsButton = ViewWidgetShowMenu.AddButton("Bitangents", () => ShowBitangents = !ShowBitangents);
+                _showBitangentsButton.CloseMenuOnClick = false;
 
                 // Show Floor
                 _showFloorButton = ViewWidgetShowMenu.AddButton("Floor", button => ShowFloor = !ShowFloor);
                 _showFloorButton.IndexInParent = 1;
+                _showFloorButton.CloseMenuOnClick = false;
 
                 // Show current LOD widget
                 _showCurrentLODButton = ViewWidgetShowMenu.AddButton("Current LOD", button =>
@@ -214,6 +219,7 @@ namespace FlaxEditor.Viewport.Previews
                     _showCurrentLODButton.Icon = _showCurrentLOD ? Style.Current.CheckBoxTick : SpriteHandle.Invalid;
                 });
                 _showCurrentLODButton.IndexInParent = 2;
+                _showCurrentLODButton.CloseMenuOnClick = false;
 
                 // Preview LODs mode widget
                 var PreviewLODsMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);
diff --git a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
index 1e0c89528..fc7fcdbe1 100644
--- a/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
+++ b/Source/Editor/Viewport/Previews/ParticleSystemPreview.cs
@@ -186,8 +186,11 @@ namespace FlaxEditor.Viewport.Previews
             if (!useWidgets)
                 return;
             _showBoundsButton = ViewWidgetShowMenu.AddButton("Bounds", () => ShowBounds = !ShowBounds);
+            _showBoundsButton.CloseMenuOnClick = false;
             _showOriginButton = ViewWidgetShowMenu.AddButton("Origin", () => ShowOrigin = !ShowOrigin);
+            _showOriginButton.CloseMenuOnClick = false;
             _showParticleCounterButton = ViewWidgetShowMenu.AddButton("Particles Counter", () => ShowParticlesCounter = !ShowParticlesCounter);
+            _showParticleCounterButton.CloseMenuOnClick = false;
 
             // Play/Pause widget
             {
diff --git a/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs b/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
index 08f8d8509..8bcc506d9 100644
--- a/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/SkinnedModelPreview.cs
@@ -49,6 +49,7 @@ namespace FlaxEditor.Viewport.Previews
                     _showCurrentLODButton.Icon = _showCurrentLOD ? Style.Current.CheckBoxTick : SpriteHandle.Invalid;
                 });
                 _showCurrentLODButton.IndexInParent = 2;
+                _showCurrentLODButton.CloseMenuOnClick = false;
 
                 // PreviewLODS mode widget
                 var PreviewLODSMode = new ViewportWidgetsContainer(ViewportWidgetLocation.UpperRight);