diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index f9b382a0a..66e1b5210 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -499,6 +499,7 @@ namespace FlaxEditor.Viewport
         {
             if (!_gameViewActive)
             {
+                // Cache flags & values
                 _preGameViewFlags = Task.ViewFlags;
                 _preGameViewViewMode = Task.ViewMode;
                 _gameViewWasGridShown = Grid.Enabled;
@@ -506,11 +507,12 @@ namespace FlaxEditor.Viewport
                 _gameViewWasNagivationShown = ShowNavigation;
             }
 
+            // Set flags & values
             Task.ViewFlags = _gameViewActive ? _preGameViewFlags : ViewFlags.DefaultGame;
             Task.ViewMode = _gameViewActive ? _preGameViewViewMode : ViewMode.Default;
-            ShowFpsCounter = _gameViewActive ? _gameViewWasGridShown : false;
-            ShowNavigation = _gameViewActive ? _gameViewWasFpsCounterShown : false;
-            Grid.Enabled = _gameViewActive ? _gameViewWasNagivationShown : false;
+            ShowFpsCounter = _gameViewActive ? _gameViewWasFpsCounterShown : false;
+            ShowNavigation = _gameViewActive ? _gameViewWasNagivationShown : false;
+            Grid.Enabled = _gameViewActive ? _gameViewWasGridShown : false;
 
             _gameViewActive = !_gameViewActive;