diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 380852c7b44b16af276d31453ba10f91cf364976..e79a4a27c317a452e03b2a4aff0d8ebca136febb 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -430,8 +430,7 @@ void StartRemoteDialog::setRemoteArchitecture(const QString &arch)
 
 QString StartRemoteDialog::remoteArchitecture() const
 {
-    int index = m_ui->architectureComboBox->currentIndex();
-    return m_ui->architectureComboBox->itemText(index);
+    return m_ui->architectureComboBox->currentText();
 }
 
 void StartRemoteDialog::setServerStartScript(const QString &scriptName)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 00bbd650247893b01a7d07037dea4d6b00e193be..e823fb85258f0b1f3d1a758dd200b1232905088f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1350,11 +1350,13 @@ void DebuggerPlugin::startRemoteApplication()
     QStringList arches;
     arches.append(_("i386:x86-64:intel"));
     arches.append(_("i386"));
+    QString lastUsed = configValue(_("LastRemoteArchitecture")).toString();
+    if (!arches.contains(lastUsed))
+        arches.prepend(lastUsed);
     dlg.setRemoteArchitectures(arches);
     dlg.setRemoteChannel(
             configValue(_("LastRemoteChannel")).toString());
-    dlg.setRemoteArchitecture(
-            configValue(_("LastRemoteArchitecture")).toString());
+    dlg.setRemoteArchitecture(lastUsed);
     dlg.setServerStartScript(
             configValue(_("LastServerStartScript")).toString());
     dlg.setUseServerStartScript(
diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui
index 5d596e17e7f9b07121e2c1acb7efef3d73dc178f..c72289f21b07f996cabb55d6b7f0d74524ae305c 100644
--- a/src/plugins/debugger/startremotedialog.ui
+++ b/src/plugins/debugger/startremotedialog.ui
@@ -47,13 +47,17 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QComboBox" name="architectureComboBox"/>
+      <widget class="QComboBox" name="architectureComboBox">
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item row="4" column="1">
       <widget class="QCheckBox" name="useServerStartScriptCheckBox"/>
      </item>
      <item row="5" column="1">
-      <widget class="Utils::PathChooser" name="serverStartScript"/>
+      <widget class="Utils::PathChooser" name="serverStartScript" native="true"/>
      </item>
      <item row="5" column="0">
       <widget class="QLabel" name="serverStartScriptLabel">
@@ -77,7 +81,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="Utils::PathChooser" name="sysrootPathChooser"/>
+      <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/>
      </item>
     </layout>
    </item>