diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 5ad6591bb9514357149f54a24401e8b3fbdc6693..3e7788a95b7325ae6e6869dd4d865c4e7ff85e3e 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -278,10 +278,8 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
         m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform);
     }
 
-    if (!availablePlatforms.isEmpty())
-        m_ui->comboBox->setCurrentIndex(1); //First Platform
-    else
-        m_ui->comboBox->setDisabled(true);
+    m_ui->comboBox->setCurrentIndex(0); // "All templates"
+    m_ui->comboBox->setEnabled(!availablePlatforms.isEmpty());
 
     foreach (IWizardFactory *factory, factories) {
         QStandardItem *kindItem;