diff --git a/Source/Editor/Windows/EditorOptionsWindow.cs b/Source/Editor/Windows/EditorOptionsWindow.cs
index c8a5338e7..17314f164 100644
--- a/Source/Editor/Windows/EditorOptionsWindow.cs
+++ b/Source/Editor/Windows/EditorOptionsWindow.cs
@@ -234,6 +234,18 @@ namespace FlaxEditor.Windows
             base.OnDestroy();
         }
 
+        /// <inheritdoc />
+        protected override void OnShow()
+        {
+            if (!_isDataDirty)
+            {
+                // Refresh the data, skip when data is modified during window docking
+                GatherData();
+            }
+
+            base.OnShow();
+        }
+
         /// <inheritdoc />
         protected override bool OnClosing(ClosingReason reason)
         {