diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
index 99b1a6fdb314..2067a9cc6a4a 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
@@ -65,7 +65,10 @@ public class CodeCompletionPanel {
      new ActionListener() {
        @Override
        public void actionPerformed(ActionEvent event) {
-         myAutocompletionDelayField.setEnabled(myCbAutocompletion.isSelected());
+         boolean selected = myCbAutocompletion.isSelected();
+         myAutocompletionDelayField.setEnabled(selected);
+         myFocusLookup.setEnabled(selected);
+         myCbSelectByChars.setEnabled(selected);
        }
      }
    );