diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index a322f3b2b13..83eab6f9eb3 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -514,7 +514,7 @@ preferenceKeywords.codetemplates=comment code constructor method file type conte
 preferenceKeywords.todo=case sensitive task tag todo xxx fix fixme project comments
 preferenceKeywords.indexer=index skip references type macro search build configuration cache memory performance
 
-preferenceKeywords.ceditor=editor quick assist appearance navigation colors smart caret positioning highlight matching bracket inactive code foreground background save trailing whitespace newline doxygen
+preferenceKeywords.ceditor=editor appearance navigation colors smart caret positioning highlight matching bracket inactive code foreground background save trailing whitespace newline doxygen
 preferenceKeywords.contentassist=editor content code assist complete completion insert overwrite single proposal common prefix automatically auto activation trigger category categories separate specific word hippie template
 preferenceKeywords.scalability=editor mode large file lines disable performance 
 preferenceKeywords.hover=editor hover annotation key modifier combined variable problem string source documentation
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 4bca9b64c36..9ebde33fbfe 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -673,6 +673,7 @@
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
             class="org.eclipse.cdt.internal.ui.preferences.CEditorPreferencePage"
             id="org.eclipse.cdt.ui.preferences.CEditorPreferencePage">
+          <keywordReference id="org.eclipse.cdt.ui.ceditor"/>
           <keywordReference id="org.eclipse.cdt.ui.common"/>
       </page>
       <page