diff --git a/src/plugins/projectexplorer/addtargetdialog.cpp b/src/plugins/projectexplorer/addtargetdialog.cpp
index c7385f8e56df4c3b1a758c2c551f633d778a20d1..d6d41d9275cf460794ef175894cea088820db17a 100644
--- a/src/plugins/projectexplorer/addtargetdialog.cpp
+++ b/src/plugins/projectexplorer/addtargetdialog.cpp
@@ -47,6 +47,8 @@ AddTargetDialog::AddTargetDialog(Project *project, QWidget *parent) :
         ui->targetComboBox->addItem(m_project->targetFactory()->displayNameForId(id),
                                     id);
     }
+    ui->targetComboBox->setCurrentIndex(0);
+    ui->targetComboBox->setEnabled(ui->targetComboBox->count() > 1);
 
     connect(ui->buttonBox, SIGNAL(accepted()),
             this, SLOT(accept()));