diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
index 24657b62f..12760c176 100644
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -1128,6 +1128,24 @@ namespace FlaxEngine.GUI
             base.OnSubmit();
         }
 
+        /// <inheritdoc />
+        public override void OnMouseEnter(Float2 location)
+        {
+            if (_isEditing)
+                Cursor = CursorType.IBeam;
+
+            base.OnMouseEnter(location);
+        }
+
+        /// <inheritdoc />
+        public override void OnMouseLeave()
+        {
+            if (Cursor == CursorType.IBeam)
+                Cursor = CursorType.Default;
+
+            base.OnMouseLeave();
+        }
+
         /// <inheritdoc />
         public override void OnMouseMove(Float2 location)
         {
@@ -1141,6 +1159,9 @@ namespace FlaxEngine.GUI
                 // Modify selection end
                 SetSelection(_selectionStart, currentIndex);
             }
+            
+            if (Cursor == CursorType.Default && _isEditing)
+                Cursor = CursorType.IBeam;
         }
 
         /// <inheritdoc />
@@ -1169,6 +1190,9 @@ namespace FlaxEngine.GUI
                 {
                     SetSelection(hitPos);
                 }
+                
+                if (Cursor == CursorType.Default)
+                    Cursor = CursorType.IBeam;
 
                 return true;
             }