diff --git a/app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java b/app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java
index 8c6299f2b..0b8690de6 100644
--- a/app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java
+++ b/app/src/processing/app/syntax/SketchTextAreaDefaultInputMap.java
@@ -49,6 +49,11 @@ public class SketchTextAreaDefaultInputMap extends RSyntaxTextAreaDefaultInputMa
 
       put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, defaultModifier | shift), DefaultEditorKit.selectionBeginAction);
       put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, defaultModifier | shift), DefaultEditorKit.selectionEndAction);
+
+      if (PreferencesData.getBoolean("editor.keys.home_and_end_to_start_end_of_doc")) {
+        put(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0), DefaultEditorKit.beginLineAction);
+        put(KeyStroke.getKeyStroke(KeyEvent.VK_END, 0), DefaultEditorKit.endLineAction);
+      }
     }
 
     put(KeyStroke.getKeyStroke(KeyEvent.VK_DIVIDE, defaultModifier), RSyntaxTextAreaEditorKit.rstaToggleCommentAction);
diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index edb47ed03..bef6fbaf4 100644
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -118,11 +118,8 @@ editor.keys.alternative_cut_copy_paste.macosx = false
 # false if shift-backspace just means backspace
 editor.keys.shift_backspace_is_delete = true
 
-# home and end keys should only travel to the start/end of the current line
-editor.keys.home_and_end_travel_far = false
-# the OS X HI Guidelines say that home/end are relative to the document
-# if you don't like it, this is the preference to change
-editor.keys.home_and_end_travel_far.macosx = true
+# if set to true, home/end keys will go to the start/end of current line
+editor.keys.home_and_end_beginning_end_of_doc = false
 
 console			 = true
 console.output.file      = stdout.txt