diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs
index 423d3af18..d10b1916f 100644
--- a/Source/Editor/Windows/PropertiesWindow.cs
+++ b/Source/Editor/Windows/PropertiesWindow.cs
@@ -74,6 +74,11 @@ namespace FlaxEditor.Windows
             if (Level.ScenesCount > 1)
                 return;
             _actorScrollValues.Clear();
+            if (LockObjects)
+            {
+                LockObjects = false;
+                Presenter.Deselect();
+            }
         }
 
         private void OnScrollValueChanged()