diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py
index ec4bd7d8..75b59e97 100644
--- a/novelwriter/gui/doceditor.py
+++ b/novelwriter/gui/doceditor.py
@@ -359,6 +359,8 @@ class GuiDocEditor(QTextEdit):
             self.clearEditor()
         else:
             self.redrawText()
+            if not self._bigDoc:
+                self.highLight.rehighlight()
 
         return True
 
diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py
index 96806648..a966346b 100644
--- a/novelwriter/guimain.py
+++ b/novelwriter/guimain.py
@@ -980,6 +980,7 @@ class GuiMain(QMainWindow):
         if dlgWords.result() == QDialog.Accepted:
             logger.debug("Reloading word list")
             SHARED.updateSpellCheckLanguage(reload=True)
+            self.docEditor.spellCheckDocument()
 
         return True