diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 9d4c2256a3b..5ad6591bb95 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -89,7 +89,7 @@ public:
         QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
         Core::IWizardFactory *wizard = factoryOfItem(qobject_cast<QStandardItemModel*>(sourceModel())->itemFromIndex(sourceIndex));
         if (wizard)
-            return m_platform.isEmpty() || wizard->isAvailable(m_platform);
+            return wizard->isAvailable(m_platform);
 
         return true;
     }
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 35df6ec65a3..a1ce7feba44 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -325,7 +325,7 @@ FeatureSet KitManager::availableFeatures(const QString &platform)
     FeatureSet features;
     foreach (const Kit *k, kits()) {
         QSet<QString> kitPlatforms = k->availablePlatforms();
-        if (kitPlatforms.isEmpty() || kitPlatforms.contains(platform))
+        if (kitPlatforms.isEmpty() || kitPlatforms.contains(platform) || platform.isEmpty())
             features |= k->availableFeatures();
     }
     return features;