diff --git a/Source/Editor/GUI/Popups/RenamePopup.cs b/Source/Editor/GUI/Popups/RenamePopup.cs
index 83fb05ecf..16fa22648 100644
--- a/Source/Editor/GUI/Popups/RenamePopup.cs
+++ b/Source/Editor/GUI/Popups/RenamePopup.cs
@@ -177,6 +177,7 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         protected override void OnShow()
         {
+            _inputField.EndEditOnClick = false; // Ending edit is handled through popup
             _inputField.Focus();
             _inputField.SelectAll();