diff --git a/app/src/processing/app/EditorTab.java b/app/src/processing/app/EditorTab.java
index 875c5446a..90089ff95 100644
--- a/app/src/processing/app/EditorTab.java
+++ b/app/src/processing/app/EditorTab.java
@@ -148,6 +148,7 @@ public class EditorTab extends JPanel implements SketchFile.TextStorage {
     textArea.setMarginLineEnabled(false);
     textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding"));
     textArea.setAutoIndentEnabled(PreferencesData.getBoolean("editor.indent"));
+    textArea.setCloseCurlyBraces(PreferencesData.getBoolean("editor.autocomplete"));
     textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias"));
     textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand"));
     textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size"));
@@ -599,4 +600,4 @@ public class EditorTab extends JPanel implements SketchFile.TextStorage {
     return textarea.requestFocusInWindow();
   }
 
-}
\ No newline at end of file
+}
diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index 8657dd50b..24b98861b 100644
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -146,6 +146,10 @@ editor.tabs.size   = 2
 # automatically indent each line
 editor.indent = true
 
+# enable/disable any 'autocomplete' features
+# this currently includes 'auto curly brace'
+editor.autocomplete = true
+
 # size of divider between editing area and the console
 editor.divider.size = 0
 # the larger divider on windows is ugly with the little arrows