diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs b/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs
index 960df47b75..8b41957bc2 100644
--- a/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs
@@ -17,8 +17,9 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels
 		{
 			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.CodeCompletionOptionPanel.xfrm"));
 			
+			EnableCodeCompletionSettingsGroupBox();
 			Get<CheckBox>("codeCompletionEnabled").CheckedChanged += delegate(object sender, EventArgs e) {
-				ControlDictionary["groupBox"].Enabled = Get<CheckBox>("codeCompletionEnabled").Checked;
+				EnableCodeCompletionSettingsGroupBox();
 			};
 			Get<CheckBox>("codeCompletionEnabled").Checked = CodeCompletionOptions.EnableCodeCompletion;
 			
@@ -64,5 +65,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels
 			CodeCompletionOptions.InsightRefreshOnComma = Get<CheckBox>("refreshInsightOnComma").Checked;
 			return base.StorePanelContents();
 		}
+		
+		void EnableCodeCompletionSettingsGroupBox()
+		{
+			ControlDictionary["groupBox"].Enabled = Get<CheckBox>("codeCompletionEnabled").Checked;
+		}
 	}
 }