diff --git a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs
index 58607bef..4a112b8d 100644
--- a/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs
+++ b/Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs
@@ -32,6 +32,11 @@ namespace HeavenStudio.Editor
                 _ =>
                 {;
                     parameterManager.entity[propertyName] = inputFieldString.text;
+                }
+            );
+            inputFieldString.onEndEdit.AddListener(
+                _ =>
+                {;
                     Editor.instance.editingInputField = false;
                 }
             );
diff --git a/Assets/Scripts/LevelEditor/Selections.cs b/Assets/Scripts/LevelEditor/Selections.cs
index a901a130..c21c9449 100644
--- a/Assets/Scripts/LevelEditor/Selections.cs
+++ b/Assets/Scripts/LevelEditor/Selections.cs
@@ -24,11 +24,14 @@ namespace HeavenStudio.Editor
             if (buggedSelections.Count > 0)
             {
                 for (int i = 0; i < buggedSelections.Count; i++)
-                Deselect(buggedSelections[i]);
+                    Deselect(buggedSelections[i]);
+            }
+            if (Editor.instance.isShortcutsEnabled)
+            {
+                if (Input.GetKey(KeyCode.LeftControl))
+                    if (Input.GetKeyDown(KeyCode.A))
+                        SelectAll();
             }
-            if (Input.GetKey(KeyCode.LeftControl))
-                if (Input.GetKeyDown(KeyCode.A))
-                    SelectAll();
         }
 
         public void ClickSelect(TimelineEventObj eventToAdd)