diff --git a/Source/Editor/Content/Tree/ContentTreeNode.cs b/Source/Editor/Content/Tree/ContentTreeNode.cs
index 1d70a8252..27e7cf76c 100644
--- a/Source/Editor/Content/Tree/ContentTreeNode.cs
+++ b/Source/Editor/Content/Tree/ContentTreeNode.cs
@@ -95,19 +95,17 @@ namespace FlaxEditor.Content
         {
             if (!_folder.CanRename)
                 return;
-            Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(false);
+
             // Start renaming the folder
-            var dialog = RenamePopup.Show(this, HeaderRect, _folder.ShortName, false);
+            Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(false);
+            var dialog = RenamePopup.Show(this, TextRect, _folder.ShortName, false);
             dialog.Tag = _folder;
             dialog.Renamed += popup =>
             {
                 Editor.Instance.Windows.ContentWin.Rename((ContentFolder)popup.Tag, popup.Text);
                 Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true);
             };
-            dialog.Closed += popup =>
-            {
-                Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true);
-            };
+            dialog.Closed += popup => { Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true); };
         }
 
         /// <summary>
diff --git a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
index ca0aaee77..10857f685 100644
--- a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
+++ b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
@@ -282,7 +282,7 @@ namespace FlaxEditor.SceneGraph.GUI
                 (window as PrefabWindow).ScrollingOnTreeView(false);
 
             // Start renaming the actor
-            var dialog = RenamePopup.Show(this, HeaderRect, _actorNode.Name, false);
+            var dialog = RenamePopup.Show(this, TextRect, _actorNode.Name, false);
             dialog.Renamed += OnRenamed;
             dialog.Closed += popup =>
             {