diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
index fe669d6888..36e0901c64 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
@@ -865,6 +865,7 @@ public:
     {
         setWantsKeyboardFocus (false);
         setInterceptsMouseClicks (false, true);
+        setMouseCursor (MouseCursor::IBeamCursor);
 
         owner.getTextValue().addListener (this);
     }
@@ -889,11 +890,6 @@ public:
         owner.timerCallbackInt();
     }
 
-    MouseCursor getMouseCursor()
-    {
-        return owner.getMouseCursor();
-    }
-
     void valueChanged (Value&)
     {
         owner.textWasChangedByValue();
@@ -985,6 +981,7 @@ TextEditor::TextEditor (const String& name,
       dragType (notDragging)
 {
     setOpaque (true);
+    setMouseCursor (MouseCursor::IBeamCursor);
 
     addAndMakeVisible (viewport = new TextEditorViewport (*this));
     viewport->setViewedComponent (textHolder = new TextHolderComponent (*this));
@@ -1168,9 +1165,6 @@ void TextEditor::setCaretVisible (const bool shouldCaretBeVisible)
     {
         caret = nullptr;
     }
-
-    setMouseCursor (shouldCaretBeVisible ? MouseCursor::IBeamCursor
-                                         : MouseCursor::NormalCursor);
 }
 
 void TextEditor::updateCaretPosition()
@@ -2228,8 +2222,6 @@ void TextEditor::handleCommandMessage (const int commandId)
 
 void TextEditor::enablementChanged()
 {
-    setMouseCursor (isReadOnly() ? MouseCursor::NormalCursor
-                                 : MouseCursor::IBeamCursor);
     repaint();
 }