diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 2933ae363..7fb4e60e0 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -2729,13 +2729,14 @@ public class JavaEditor extends Editor {
   }
 
 
+  @Override
   protected void applyPreferences() {
     super.applyPreferences();
     if (jmode != null) {
       jmode.loadPreferences();
       Messages.log("Applying prefs");
       // trigger it once to refresh UI
-      errorCheckerService.request();
+      errorCheckerService.handleErrorCheckingToggle();
     }
   }
 
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
index 6b54a639d..18d8581d7 100644
--- a/java/src/processing/mode/java/pdex/ErrorCheckerService.java
+++ b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -275,7 +275,6 @@ public class ErrorCheckerService {
         astGenerator.buildAST(lastCodeCheckResult.sourceCode,
                               lastCodeCheckResult.compilationUnit);
       }
-      handleErrorCheckingToggle();
 
       while (running) {
         try {
@@ -1556,10 +1555,10 @@ public class ErrorCheckerService {
     return new String(p2, 0, index);
   }
 
+
   public void handleErrorCheckingToggle() {
     if (!JavaMode.errorCheckEnabled) {
-      Messages.log(editor.getSketch().getName() + " Error Checker paused.");
-      //editor.clearErrorPoints();
+      Messages.log(editor.getSketch().getName() + " Error Checker disabled.");
       editor.getErrorPoints().clear();
       lastCodeCheckResult.problems.clear();
       updateErrorTable(Collections.<Problem>emptyList());
@@ -1567,7 +1566,7 @@ public class ErrorCheckerService {
       editor.getTextArea().repaint();
       editor.repaintErrorBar();
     } else {
-      Messages.log(editor.getSketch().getName() + " Error Checker resumed.");
+      Messages.log(editor.getSketch().getName() + " Error Checker enabled.");
       request();
     }
   }