diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 30918d81915..3295a4cfa68 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1339,16 +1339,6 @@
    </extension>
    <extension
          point="org.eclipse.cdt.ui.IndexerPage">
-      <indexerUI
-            class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
-            indexerID="org.eclipse.cdt.core.nullindexer"
-            name="%CDTIndexer.nullindexer"
-            id="org.eclipse.cdt.ui.nullindexerUI"/>
-      <indexerUI
-            class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
-            indexerID="org.eclipse.cdt.core.originalsourceindexer"
-            name="%CDTIndexer.originalsourceindexer"
-            id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
  	  <indexerUI
             class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
             id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
@@ -1359,6 +1349,16 @@
             indexerID="org.eclipse.cdt.core.ctagsindexer"
             name="%CDTIndexer.ctagsindexer"
             id="org.eclipse.cdt.ui.ctagsIndexerUI"/>
+      <indexerUI
+            class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
+            indexerID="org.eclipse.cdt.core.nullindexer"
+            name="%CDTIndexer.nullindexer"
+            id="org.eclipse.cdt.ui.nullindexerUI"/>
+      <indexerUI
+            class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
+            indexerID="org.eclipse.cdt.core.originalsourceindexer"
+            name="%CDTIndexer.originalsourceindexer"
+            id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
 <!--TODO reverse this <indexerUI
             class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
             id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
index bde98348b30..ad42b931666 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
@@ -69,6 +69,7 @@ public class IndexerBlock extends AbstractCOptionPage {
 	
     private Combo 					indexersComboBox;
     private HashMap 				indexerPageMap;
+    private List                    indexerPageList;
     private String 					selectedIndexerId = null;
 	private Composite 				parentComposite;
     private ICOptionPage 		 	currentPage;
@@ -252,6 +253,7 @@ public class IndexerBlock extends AbstractCOptionPage {
      */
     private void initializeIndexerPageMap() {
         indexerPageMap = new HashMap(5);
+        indexerPageList = new ArrayList(5);
         
         IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CUIPlugin.getPluginId(), "IndexerPage"); //$NON-NLS-1$
         IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
@@ -259,6 +261,7 @@ public class IndexerBlock extends AbstractCOptionPage {
             if (infos[i].getName().equals("indexerUI")) { //$NON-NLS-1$
                 String id = infos[i].getAttribute("indexerID"); //$NON-NLS-1$
                 indexerPageMap.put(id, new IndexerPageConfiguration(infos[i]));
+                indexerPageList.add(id);
             }
         }
     }
@@ -268,7 +271,7 @@ public class IndexerBlock extends AbstractCOptionPage {
      * Returns the contributed Indexer Pages as a list
      */
     protected List getIndexerPageIdList() {
-        return new ArrayList(indexerPageMap.keySet());
+        return indexerPageList;
     }
   
     /**