diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
index 7560f2bddfe887038f9d4c6e9e8766fa43bd96ea..36a68afa13179310fa22221c3ac72365b5b24819 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfiglistmodel.cpp
@@ -66,9 +66,10 @@ void MaemoDeviceConfigListModel::setupList()
 
 void MaemoDeviceConfigListModel::setCurrentIndex(int index)
 {
-    if (index != m_currentIndex) {
+    const quint64 idForIndex = m_devConfigs.at(index).internalId;
+    if (idForIndex != m_currentId) {
+        m_currentId = idForIndex;
         m_currentIndex = index;
-        m_currentId = m_devConfigs.at(m_currentIndex).internalId;
         emit currentChanged();
     }
 }
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
index 13aeceedbe13c4ceba2a9050e667b2a2562ddd7c..b55aea670e633a89eecc615f0ed1ba620854116c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
@@ -202,6 +202,7 @@ void MaemoSettingsWidget::display(const MaemoDeviceConfig &devConfig)
     otherConfig->server.timeout = devConfig.server.timeout;
     otherConfig->server.pwd = devConfig.server.pwd;
     otherConfig->server.privateKeyFile = devConfig.server.privateKeyFile;
+    otherConfig->internalId = devConfig.internalId;
 
     if (devConfig.server.authType == Core::SshConnectionParameters::AuthByPwd)
         m_ui->passwordButton->setChecked(true);