diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index f171840b5..a9eab5ceb 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -530,7 +530,7 @@ namespace FlaxEditor.Viewport
         }
 
         /// <summary>
-        /// Toggles game view view mode on or off.
+        /// Toggles view mode on/off.
         /// </summary>
         public void ToggleGameView()
         {
@@ -547,9 +547,9 @@ namespace FlaxEditor.Viewport
             // Set flags & values
             Task.ViewFlags = _gameViewActive ? _preGameViewFlags : ViewFlags.DefaultGame;
             Task.ViewMode = _gameViewActive ? _preGameViewViewMode : ViewMode.Default;
-            ShowFpsCounter = _gameViewActive ? _gameViewWasFpsCounterShown : false;
-            ShowNavigation = _gameViewActive ? _gameViewWasNavigationShown : false;
-            Grid.Enabled = _gameViewActive ? _gameViewWasGridShown : false;
+            ShowFpsCounter = _gameViewActive && _gameViewWasFpsCounterShown;
+            ShowNavigation = _gameViewActive && _gameViewWasNavigationShown;
+            Grid.Enabled = _gameViewActive && _gameViewWasGridShown;
 
             _gameViewActive = !_gameViewActive;
 
@@ -730,6 +730,20 @@ namespace FlaxEditor.Viewport
             base.OnLeftMouseButtonUp();
         }
 
+        /// <inheritdoc />
+        public override bool OnKeyDown(KeyboardKeys key)
+        {
+            if (base.OnKeyDown(key))
+                return true;
+
+            if (key == KeyboardKeys.Escape)
+            {
+                _editor.SceneEditing.Deselect();
+            }
+
+            return false;
+        }
+
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {