diff --git a/Source/Editor/Modules/SimulationModule.cs b/Source/Editor/Modules/SimulationModule.cs
index dd83d7553..155372a7a 100644
--- a/Source/Editor/Modules/SimulationModule.cs
+++ b/Source/Editor/Modules/SimulationModule.cs
@@ -279,11 +279,11 @@ namespace FlaxEditor.Modules
                     case Options.InterfaceOptions.PlayModeFocus.None:
                         break;
 
-                    case Options.InterfaceOptions.PlayModeFocus.GamePanel:
+                    case Options.InterfaceOptions.PlayModeFocus.GameWindow:
                         gameWin.FocusGameViewport();
                         break;
 
-                    case Options.InterfaceOptions.PlayModeFocus.GamePanelThenBack:
+                    case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestore:
                         _previousWindow = gameWin.ParentDockPanel.SelectedTab;
                         gameWin.FocusGameViewport();
                         break;
@@ -305,10 +305,10 @@ namespace FlaxEditor.Modules
                 case Options.InterfaceOptions.PlayModeFocus.None:
                     break;
 
-                case Options.InterfaceOptions.PlayModeFocus.GamePanel:
+                case Options.InterfaceOptions.PlayModeFocus.GameWindow:
                     break;
 
-                case Options.InterfaceOptions.PlayModeFocus.GamePanelThenBack:
+                case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestore:
                     if (!Editor.Windows.GameWin.ParentDockPanel.ContainsTab(_previousWindow))
                         break;
 
diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index 75ce94ea3..5b01b88ba 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -1,5 +1,6 @@
 // Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
+using System;
 using System.ComponentModel;
 using FlaxEditor.GUI.Docking;
 using FlaxEngine;
@@ -138,24 +139,24 @@ namespace FlaxEditor.Options
         }
 
         /// <summary>
-        /// Options for on play mode start panel focus.
+        /// Options focus Game Window behaviour when play mode is entered.
         /// </summary>
         public enum PlayModeFocus
         {
             /// <summary>
-            /// Don't change any focus.
+            /// Don't change focus.
             /// </summary>
             None,
 
             /// <summary>
-            /// Focus the Game panel.
+            /// Focus the Game Window.
             /// </summary>
-            GamePanel,
+            GameWindow,
 
             /// <summary>
-            /// Focus the Game panel. On play mode end focus the previous panel again.
+            /// Focus the Game Window. On play mode end restore focus to the previous window.
             /// </summary>
-            GamePanelThenBack,  
+            GameWindowThenRestore,  
         }
 
         /// <summary>
@@ -363,9 +364,9 @@ namespace FlaxEditor.Options
         /// <summary>
         /// Gets or sets a value indicating what panel should be focused when play mode start.
         /// </summary>
-        [DefaultValue(PlayModeFocus.GamePanel)]
+        [DefaultValue(PlayModeFocus.GameWindow)]
         [EditorDisplay("Play In-Editor", "Focus On Play"), EditorOrder(500), Tooltip("Set what panel to focus on play mode start.")]
-        public PlayModeFocus FocusOnPlayMode { get; set; } = PlayModeFocus.GamePanel;
+        public PlayModeFocus FocusOnPlayMode { get; set; } = PlayModeFocus.GameWindow;
 
         /// <summary>
         /// Gets or sets a value indicating what action should be taken upon pressing the play button.
diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs
index c10c27913..d73facfd2 100644
--- a/Source/Editor/Windows/GameWindow.cs
+++ b/Source/Editor/Windows/GameWindow.cs
@@ -49,15 +49,15 @@ namespace FlaxEditor.Windows
             },
             new PlayModeFocusOptions
             {
-                Name = "Game Panel",
-                Tooltip = "Focus the Game panel.",
-                FocusOption = InterfaceOptions.PlayModeFocus.GamePanel,
+                Name = "Game Window",
+                Tooltip = "Focus the Game Window.",
+                FocusOption = InterfaceOptions.PlayModeFocus.GameWindow,
             },
             new PlayModeFocusOptions
             {
-                Name = "Game Panel Then Back",
-                Tooltip = "Focus the Game panel. On play mode end focus the previous panel again.",
-                FocusOption = InterfaceOptions.PlayModeFocus.GamePanelThenBack,
+                Name = "Game Window Then Back",
+                Tooltip = "Focus the Game Window. On play mode end restore focus to the previous window.",
+                FocusOption = InterfaceOptions.PlayModeFocus.GameWindowThenRestore,
             },
         };