diff --git a/app/src/processing/app/PreferencesFrame.java b/app/src/processing/app/PreferencesFrame.java
index 7064e3e6e..070c2343f 100644
--- a/app/src/processing/app/PreferencesFrame.java
+++ b/app/src/processing/app/PreferencesFrame.java
@@ -71,7 +71,7 @@ public class PreferencesFrame {
   JCheckBox warningsCheckerBox;
   JCheckBox codeCompletionBox;
   JCheckBox importSuggestionsBox;
-  JCheckBox codeCompletionTriggerBox;
+  //JCheckBox codeCompletionTriggerBox;
 
   JComboBox<String> displaySelectionBox;
   JComboBox<String> languageSelectionBox;
@@ -398,29 +398,29 @@ public class PreferencesFrame {
     // [ ] Enable Code Completion - PDE X
 
     codeCompletionBox =
-      new JCheckBox(Language.text("preferences.code_completion"));
+      new JCheckBox(Language.text("preferences.code_completion") + " Ctrl-" + Language.text("preferences.cmd_space"));
     pain.add(codeCompletionBox);
     d = codeCompletionBox.getPreferredSize();
     codeCompletionBox.setBounds(left, top, d.width + 10, d.height);
-    codeCompletionBox.addActionListener(new ActionListener() {
+//    codeCompletionBox.addActionListener(new ActionListener() {
+//
+//      @Override
+//      public void actionPerformed(ActionEvent e) {
+//        // Disble code completion trigger option if completion is disabled
+//        codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
+//      }
+//    });
 
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        // Disble code completion trigger option if completion is disabled
-        codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
-      }
-    });
+//    int toggleLeft = left + d.width;
 
-    int toggleLeft = left + d.width;
+    // [ ] Toggle Code Completion Trigger - PDE X. No longer needed (Manindra)
 
-    // [ ] Toggle Code Completion Trigger - PDE X
-
-    codeCompletionTriggerBox =
-      new JCheckBox(Language.text("preferences.trigger_with")+" Ctrl-"+Language.text("preferences.cmd_space"));
-    pain.add(codeCompletionTriggerBox);
-    d = codeCompletionTriggerBox.getPreferredSize();
-    codeCompletionTriggerBox.setBounds(toggleLeft, top, d.width + 10, d.height);
-    right = Math.max(right, toggleLeft + d.width);
+//    codeCompletionTriggerBox =
+//      new JCheckBox(Language.text("preferences.trigger_with")+" Ctrl-"+Language.text("preferences.cmd_space"));
+//    pain.add(codeCompletionTriggerBox);
+//    d = codeCompletionTriggerBox.getPreferredSize();
+//    codeCompletionTriggerBox.setBounds(toggleLeft, top, d.width + 10, d.height);
+//    right = Math.max(right, toggleLeft + d.width);
     top += d.height + GUI_BETWEEN;
 
     // [ ] Show import suggestions - PDE X
@@ -764,7 +764,7 @@ public class PreferencesFrame {
     Preferences.setBoolean("pdex.errorCheckEnabled", errorCheckerBox.isSelected());
     Preferences.setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());
     Preferences.setBoolean("pdex.completion", codeCompletionBox.isSelected());
-    Preferences.setBoolean("pdex.completion.trigger", codeCompletionTriggerBox.isSelected());
+    //Preferences.setBoolean("pdex.completion.trigger", codeCompletionTriggerBox.isSelected());
     Preferences.setBoolean("pdex.importSuggestEnabled", importSuggestionsBox.isSelected());
 
     for (Editor editor : base.getEditors()) {
@@ -779,8 +779,8 @@ public class PreferencesFrame {
     errorCheckerBox.setSelected(Preferences.getBoolean("pdex.errorCheckEnabled"));
     warningsCheckerBox.setSelected(Preferences.getBoolean("pdex.warningsEnabled"));
     codeCompletionBox.setSelected(Preferences.getBoolean("pdex.completion"));
-    codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.completion.trigger"));
-    codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
+    //codeCompletionTriggerBox.setSelected(Preferences.getBoolean("pdex.completion.trigger"));
+    //codeCompletionTriggerBox.setEnabled(codeCompletionBox.isSelected());
     importSuggestionsBox.setSelected(Preferences.getBoolean("pdex.importSuggestEnabled"));
     deletePreviousBox.
       setSelected(Preferences.getBoolean("export.delete_target_folder")); //$NON-NLS-1$
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
index ab3f4caf9..961212cc4 100644
--- a/build/shared/lib/languages/PDE.properties
+++ b/build/shared/lib/languages/PDE.properties
@@ -167,7 +167,7 @@ preferences.enable_complex_text_input = Enable complex text input
 preferences.enable_complex_text_input_example = i.e. Japanese
 preferences.continuously_check = Continuously check for errors
 preferences.show_warnings = Show warnings
-preferences.code_completion = Code completion
+preferences.code_completion = Code completion with
 preferences.trigger_with = Trigger with
 preferences.cmd_space = space
 preferences.suggest_imports = Suggest import statements
diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java
index 8b8992bae..6715010f9 100755
--- a/pdex/src/processing/mode/experimental/ExperimentalMode.java
+++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java
@@ -140,13 +140,13 @@ public class ExperimentalMode extends JavaMode {
       debugOutputEnabled = false, errorLogsEnabled = false,
       autoSaveEnabled = true, autoSavePromptEnabled = true,
       defaultAutoSaveEnabled = true, // ,untitledAutoSaveEnabled;
-      ccTriggerEnabled = true, importSuggestEnabled = true;
+      ccTriggerEnabled = false, importSuggestEnabled = true;
   public static int autoSaveInterval = 3; //in minutes
 
   /**
    * After how many typed characters, code completion is triggered
    */
-  volatile public static int codeCompletionTriggerLength = 2;
+  volatile public static int codeCompletionTriggerLength = 1;
 
   static public final String prefErrorCheck = "pdex.errorCheckEnabled";
   static public final String prefWarnings = "pdex.warningsEnabled";
diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java
index a17cd2dee..e28dc6ab7 100644
--- a/pdex/src/processing/mode/experimental/TextArea.java
+++ b/pdex/src/processing/mode/experimental/TextArea.java
@@ -228,12 +228,12 @@ public class TextArea extends JEditTextArea {
       final KeyEvent evt2 = evt;
       
       if (keyChar == '.') {
-        if (ExperimentalMode.codeCompletionsEnabled && ExperimentalMode.ccTriggerEnabled) {
+        if (ExperimentalMode.codeCompletionsEnabled) {
           log("[KeyEvent]" + KeyEvent.getKeyText(evt2.getKeyCode()) + "  |Prediction started");
           log("Typing: " + fetchPhrase(evt2));
         }
       } else if (keyChar == ' ') { // Trigger on Ctrl-Space
-        if (!Base.isMacOS() && ExperimentalMode.ccTriggerEnabled &&
+        if (!Base.isMacOS() && ExperimentalMode.codeCompletionsEnabled &&
         (evt.isControlDown() || evt.isMetaDown())) {
           SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
             protected Object doInBackground() throws Exception {
@@ -252,7 +252,9 @@ public class TextArea extends JEditTextArea {
           hideSuggestion(); // hide on spacebar
         }
       } else {
-        prepareSuggestions(evt2);
+        if(ExperimentalMode.codeCompletionsEnabled) {
+          prepareSuggestions(evt2);
+        }
       }
     }
     // #2699 - Special case for OS X, where Ctrl-Space is not detected as Key_Typed -_-
@@ -262,8 +264,7 @@ public class TextArea extends JEditTextArea {
       SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
         protected Object doInBackground() throws Exception {
           // Provide completions only if it's enabled
-          if (ExperimentalMode.codeCompletionsEnabled
-              && ExperimentalMode.ccTriggerEnabled) {
+          if (ExperimentalMode.codeCompletionsEnabled) {
             log("[KeyEvent]" + KeyEvent.getKeyText(evt2.getKeyCode()) + "  |Prediction started");
             log("Typing: " + fetchPhrase(evt2));
           }
@@ -283,7 +284,7 @@ public class TextArea extends JEditTextArea {
       protected Object doInBackground() throws Exception {
         // Provide completions only if it's enabled
         if (ExperimentalMode.codeCompletionsEnabled
-            && (!ExperimentalMode.ccTriggerEnabled || suggestion.isVisible())) {
+            && (ExperimentalMode.ccTriggerEnabled || suggestion.isVisible())) {
           log("[KeyEvent]" + evt.getKeyChar() + "  |Prediction started");
           log("Typing: " + fetchPhrase(evt));
         }