diff --git a/Source/Editor/CustomEditors/GUI/PropertiesList.cs b/Source/Editor/CustomEditors/GUI/PropertiesList.cs
index 3847a8f36..f430bae06 100644
--- a/Source/Editor/CustomEditors/GUI/PropertiesList.cs
+++ b/Source/Editor/CustomEditors/GUI/PropertiesList.cs
@@ -70,9 +70,9 @@ namespace FlaxEditor.CustomEditors.GUI
             UpdateSplitRect();
         }
 
-        private void AutoSizeSplitter()
+        private void AutoSizeSplitter(bool ignoreCustomSplitterValue = false)
         {
-            if (_hasCustomSplitterValue || !Editor.Instance.Options.Options.Interface.AutoSizePropertiesPanelSplitter)
+            if (_hasCustomSplitterValue && !ignoreCustomSplitterValue)
                 return;
 
             Font font = Style.Current.FontMedium;
@@ -178,6 +178,21 @@ namespace FlaxEditor.CustomEditors.GUI
             return base.OnMouseDown(location, button);
         }
 
+        /// <inheritdoc />
+        public override bool OnMouseDoubleClick(Float2 location, MouseButton button)
+        {
+            if (button == MouseButton.Left && _splitterRect.Contains(location))
+            {
+                if (_splitterClicked)
+                    EndTracking();
+
+                AutoSizeSplitter(true);
+                return true;
+            }
+
+            return base.OnMouseDoubleClick(location, button);
+        }
+
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
@@ -220,7 +235,8 @@ namespace FlaxEditor.CustomEditors.GUI
             // Refresh
             UpdateSplitRect();
             PerformLayout(true);
-            AutoSizeSplitter();
+            if (Editor.Instance.Options.Options.Interface.AutoSizePropertiesPanelSplitter)
+                AutoSizeSplitter();
         }
 
         /// <inheritdoc />