diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 4b076c64d..48959ac58 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -504,7 +504,7 @@ public class Editor extends JFrame implements RunnerListener {
 
     } else {
       textarea.setBackground(Theme.getColor("editor.bgcolor"));
-      textarea.setHighlightCurrentLine(PreferencesData.getBoolean("editor.linehighlight"));
+      textarea.setHighlightCurrentLine(Theme.getBoolean("editor.linehighlight"));
       textarea.setEditable(true);
     }
 
diff --git a/app/src/processing/app/syntax/SketchTextArea.java b/app/src/processing/app/syntax/SketchTextArea.java
index fbd9e0c7c..0382aa134 100644
--- a/app/src/processing/app/syntax/SketchTextArea.java
+++ b/app/src/processing/app/syntax/SketchTextArea.java
@@ -32,13 +32,15 @@ package processing.app.syntax;
 
 import org.apache.commons.compress.utils.IOUtils;
 import org.fife.ui.rsyntaxtextarea.*;
-import org.fife.ui.rsyntaxtextarea.Theme;
 import org.fife.ui.rsyntaxtextarea.Token;
 import org.fife.ui.rsyntaxtextarea.focusabletip.FocusableTip;
 import org.fife.ui.rtextarea.RTextArea;
 import org.fife.ui.rtextarea.RTextAreaUI;
 import org.fife.ui.rtextarea.RUndoManager;
-import processing.app.*;
+import processing.app.Base;
+import processing.app.BaseNoGui;
+import processing.app.EditorListener;
+import processing.app.PreferencesData;
 
 import javax.swing.*;
 import javax.swing.event.EventListenerList;
@@ -107,6 +109,7 @@ public class SketchTextArea extends RSyntaxTextArea {
     }
 
     setBackground(processing.app.Theme.getColor("editor.bgcolor"));
+    setHighlightCurrentLine(processing.app.Theme.getBoolean("editor.linehighlight"));
     setCurrentLineHighlightColor(processing.app.Theme.getColor("editor.linehighlight.color"));
     setCaretColor(processing.app.Theme.getColor("editor.caret.color"));
     setSelectedTextColor(null);
diff --git a/build/shared/lib/theme/theme.txt b/build/shared/lib/theme/theme.txt
index 17d66d75a..9c397cfa2 100644
--- a/build/shared/lib/theme/theme.txt
+++ b/build/shared/lib/theme/theme.txt
@@ -50,7 +50,7 @@ editor.bgcolor = #ffffff
 # highlight for the current line
 editor.linehighlight.color=#e2e2e2
 # highlight for the current line
-editor.linehighlight=true
+editor.linehighlight=false
 
 # caret blinking and caret color
 editor.caret.color = #333300