diff --git a/Scripts/Editor/RenamePopup.cs b/Scripts/Editor/RenamePopup.cs
index e269d06..a43837f 100644
--- a/Scripts/Editor/RenamePopup.cs
+++ b/Scripts/Editor/RenamePopup.cs
@@ -75,5 +75,9 @@ namespace XNodeEditor {
                 Close();
             }
         }
+
+        private void OnDestroy() {
+            EditorGUIUtility.editingTextField = false;
+        }
     }
 }
\ No newline at end of file