diff --git a/Source/Editor/CustomEditors/Editors/StringEditor.cs b/Source/Editor/CustomEditors/Editors/StringEditor.cs
index 22e6b2e71..d2d214eb5 100644
--- a/Source/Editor/CustomEditors/Editors/StringEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/StringEditor.cs
@@ -30,7 +30,6 @@ namespace FlaxEditor.CustomEditors.Editors
             }
 
             _element = layout.TextBox(isMultiLine);
-            _element.TextBox.EndEditOnClick = true;
             _element.TextBox.EditEnd += () => SetValue(_element.Text);
         }
 
diff --git a/Source/Editor/GUI/Input/SliderControl.cs b/Source/Editor/GUI/Input/SliderControl.cs
index 6fe9a246e..7a8b82622 100644
--- a/Source/Editor/GUI/Input/SliderControl.cs
+++ b/Source/Editor/GUI/Input/SliderControl.cs
@@ -371,7 +371,6 @@ namespace FlaxEditor.GUI.Input
                 Parent = this,
                 Location = new Float2(split, 0),
                 Size = new Float2(Height, TextBoxSize),
-                EndEditOnClick = true,
             };
             _textBox.EditEnd += OnTextBoxEditEnd;
         }
diff --git a/Source/Editor/GUI/Input/ValueBox.cs b/Source/Editor/GUI/Input/ValueBox.cs
index c25455612..ac253b79d 100644
--- a/Source/Editor/GUI/Input/ValueBox.cs
+++ b/Source/Editor/GUI/Input/ValueBox.cs
@@ -125,7 +125,6 @@ namespace FlaxEditor.GUI.Input
             _min = min;
             _max = max;
             _slideSpeed = sliderSpeed;
-            EndEditOnClick = true;
         }
 
         /// <summary>
diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
index addf967dc..0e9c34954 100644
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -143,7 +143,7 @@ namespace FlaxEngine.GUI
         /// Gets or sets a value indicating whether the text box can end edit via left click outside of the control
         /// </summary>
         [HideInEditor]
-        public bool EndEditOnClick { get; set; } = false;
+        public bool EndEditOnClick { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether this is a multiline text box control.