diff --git a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
index 3699b8254..293f09b54 100644
--- a/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
+++ b/Source/Editor/CustomEditors/Dedicated/ActorEditor.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using FlaxEditor.Actions;
 using FlaxEditor.CustomEditors.Editors;
 using FlaxEditor.CustomEditors.Elements;
@@ -9,6 +10,7 @@ using FlaxEditor.GUI;
 using FlaxEditor.GUI.ContextMenu;
 using FlaxEditor.GUI.Tree;
 using FlaxEditor.Scripting;
+using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.GUI;
 using FlaxEngine.Json;
@@ -111,6 +113,22 @@ namespace FlaxEditor.CustomEditors.Dedicated
             var actor = (Actor)Values[0];
             var scriptType = TypeUtils.GetType(actor.TypeName);
             var item = scriptType.ContentItem;
+            if (Presenter.Owner is PropertiesWindow pw)
+            {
+                var lockButton = cm.AddButton(pw.LockObjects ? "Unlock" : "Lock");
+                lockButton.ButtonClicked += button =>
+                {
+                    pw.LockObjects = !pw.LockObjects;
+
+                    // Reselect current selection
+                    if (!pw.LockObjects && Editor.Instance.SceneEditing.SelectionCount > 0)
+                    {
+                        var cachedSelection = Editor.Instance.SceneEditing.Selection.ToArray();
+                        Editor.Instance.SceneEditing.Select(null);
+                        Editor.Instance.SceneEditing.Select(cachedSelection);
+                    }
+                };
+            }
             cm.AddButton("Copy ID", OnClickCopyId);
             cm.AddButton("Edit actor type", OnClickEditActorType).Enabled = item != null;
             var showButton = cm.AddButton("Show in content window", OnClickShowActorType);
diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs
index 17b269c1b..9c1cbec0d 100644
--- a/Source/Editor/Windows/PropertiesWindow.cs
+++ b/Source/Editor/Windows/PropertiesWindow.cs
@@ -37,6 +37,11 @@ namespace FlaxEditor.Windows
         /// </summary>
         public bool UIPivotRelative = true;
 
+        /// <summary>
+        /// Indication of if the properties window is locked on specific objects.
+        /// </summary>
+        public bool LockObjects = false;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertiesWindow"/> class.
         /// </summary>
@@ -62,6 +67,9 @@ namespace FlaxEditor.Windows
 
         private void OnSelectionChanged()
         {
+            if (LockObjects)
+                return;
+
             // Update selected objects
             // TODO: use cached collection for less memory allocations
             undoRecordObjects = Editor.SceneEditing.Selection.ConvertAll(x => x.UndoRecordObject).Distinct();