diff --git a/CodeEditor.py b/CodeEditor.py
index 1a8a695..5db1b83 100644
--- a/CodeEditor.py
+++ b/CodeEditor.py
@@ -170,8 +170,10 @@ class CodeEditor(QPlainTextEdit):
 
     @QtCore.Slot("QString")
     def slotDirChanged(self, path):
+        allowReload = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").GetBool("allowReload")
+
         # Make sure that the contents of our file actually changed
-        if self.changedOnDisk():
+        if self.changedOnDisk() and allowReload:
             FreeCAD.Console.PrintMessage("Contents of " + self.file_path + " changed, reloading \r\n")
 
             self.reload()
diff --git a/SettingsDialog.py b/SettingsDialog.py
index 548d0ef..3b97ddc 100644
--- a/SettingsDialog.py
+++ b/SettingsDialog.py
@@ -64,7 +64,7 @@ class SettingsDialog(QtGui.QDialog):
         FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").SetString("executeKeybinding", self.ui_key_binding.text())
         FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").SetBool("executeOnSave", self.execute_on_save.checkState())
         FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").SetBool("showLineNumbers", self.show_line_numbers.checkState())
-        FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").SetBool("allowReload", self.show_line_numbers.checkState())
+        FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/cadquery-freecad-module").SetBool("allowReload", self.allow_reload.checkState())
 
         self.accept()