diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 64408836ea2..1ea77692b68 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -698,7 +698,6 @@ void AndroidConfigurations::load()
     settings->beginGroup(SettingsGroup);
     m_config = AndroidConfig(*settings);
     settings->endGroup();
-    updateAndroidDevice();
 }
 
 void AndroidConfigurations::updateAndroidDevice()
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 7ce0999778c..fd3f6e1e775 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -115,6 +115,9 @@ public:
     static QLatin1String toolchainPrefix(ProjectExplorer::Abi::Architecture architecture);
     static QLatin1String toolsPrefix(ProjectExplorer::Abi::Architecture architecture);
 
+    // called from AndroidPlugin
+    void updateAndroidDevice();
+
 signals:
     void updated();
 
@@ -132,7 +135,6 @@ private:
 
     int getSDKVersion(const QString &device) const;
     void updateAvailablePlatforms();
-    void updateAndroidDevice();
 
 
     static AndroidConfigurations *m_instance;
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index b762f10db1f..e3477a30ca0 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -77,6 +77,9 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
             this, SLOT(kitsRestored()));
 
+    connect(ProjectExplorer::DeviceManager::instance(), SIGNAL(devicesLoaded()),
+            this, SLOT(updateDevice()));
+
     return true;
 }
 
@@ -89,6 +92,11 @@ void AndroidPlugin::kitsRestored()
                this, SLOT(kitsRestored()));
 }
 
+void AndroidPlugin::updateDevice()
+{
+    Internal::AndroidConfigurations::instance().updateAndroidDevice();
+}
+
 } // namespace Android
 
 Q_EXPORT_PLUGIN(Android::AndroidPlugin)
diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index c26cc5d0f05..e2b3542991a 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -46,6 +46,7 @@ public:
     void extensionsInitialized() { }
 
 private slots:
+    void updateDevice();
     void kitsRestored();
 };