diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
index f2fcd69b16..8a9490271d 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.cpp
@@ -1082,6 +1082,11 @@ void TextEditor::colourChanged()
 }
 
 void TextEditor::lookAndFeelChanged()
+{
+    recreateCaret();
+}
+
+void TextEditor::recreateCaret()
 {
     if (isCaretVisible())
     {
@@ -2128,7 +2133,7 @@ void TextEditor::handleCommandMessage (const int commandId)
 
 void TextEditor::enablementChanged()
 {
-    setCaretVisible (isCaretVisible());
+    recreateCaret();
     repaint();
 }
 
diff --git a/modules/juce_gui_basics/widgets/juce_TextEditor.h b/modules/juce_gui_basics/widgets/juce_TextEditor.h
index d4863b7708..330c247d88 100644
--- a/modules/juce_gui_basics/widgets/juce_TextEditor.h
+++ b/modules/juce_gui_basics/widgets/juce_TextEditor.h
@@ -712,6 +712,7 @@ private:
 
     void moveCaret (int newCaretPos);
     void moveCaretTo (int newPosition, bool isSelecting);
+    void recreateCaret();
     void handleCommandMessage (int) override;
     void coalesceSimilarSections();
     void splitSection (int sectionIndex, int charToSplitAt);