diff --git a/LanguageTools/LanguageTools.py b/LanguageTools/LanguageTools.py
index bac4479..b3c3e09 100644
--- a/LanguageTools/LanguageTools.py
+++ b/LanguageTools/LanguageTools.py
@@ -347,6 +347,10 @@ def updateGUIFromSettings(self):
       self.ui.weblateDownloadUrlEdit.text = settings.value("WeblateDownloadUrl", "https://hosted.weblate.org/download/3d-slicer")
       self.ui.githubRepositoryUrlEdit.text = settings.value("GitRepository", "https://github.com/Slicer/SlicerLanguageTranslations")
 
+      # Boolean values are stored as strings in the settings.
+      # False becomes 'false' and True becomes 'true'
+      textFinderIsEnabled = settings.value("EnableFindText", True)
+      self.ui.enableTextFindercheckBox.checked = True if (textFinderIsEnabled in [True, 'true']) else False
       self.ui.textFinderLanguageEdit.text = settings.value("FindTextLanguage", "fr-FR")
 
     finally:
@@ -379,6 +383,7 @@ def updateSettingsFromGUI(self):
       settings.setValue("WeblateDownloadUrl", self.ui.weblateDownloadUrlEdit.text)
       settings.setValue("LreleaseFilePath", self.ui.lreleasePathLineEdit.currentPath)
 
+      settings.setValue("EnableFindText", self.ui.enableTextFindercheckBox.checked)
       settings.setValue("FindTextLanguage", self.ui.textFinderLanguageEdit.text)
 
       languages = self.selectedWeblateLanguages()
@@ -429,8 +434,8 @@ def onRestartButton(self):
     slicer.util.restart()
 
   def enableTextFinder(self, enable):
+    self.updateSettingsFromGUI()
     if enable:
-      self.updateSettingsFromGUI()
       self.logic.preferredLanguage = self.ui.textFinderLanguageEdit.text
     self.textFinder.enableShortcut(enable)
     # Only allow changing language if finder is disabled