diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index d6bcd2d5f056b9691970eb61245369af246488ed..b0ce36d55d3eab964ce5defcad39981b66b52c59 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -286,6 +286,7 @@ void MaemoRunConfigurationWidget::handleToolchainChanged()
         = m_runConfiguration->toolchain()->allowsRemoteMounts();
     m_debugDetailsContainer->setVisible(remoteMountsAvailable);
     m_mountDetailsContainer->setVisible(remoteMountsAvailable);
+    m_runConfiguration->updateFactoryState();
 }
 
 void MaemoRunConfigurationWidget::showSettingsDialog(const QString &link)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
index dad1736d5a974915c05f29aadf83f8a34490e698..f531d609c7ea54e62cdc4d99d5455734bab479c3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
@@ -39,6 +39,7 @@
 #include "maemoremotemountsmodel.h"
 #include "maemorunconfiguration.h"
 #include "maemoruncontrol.h"
+#include "maemotoolchain.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qt4projectmanager/qt4project.h>
@@ -167,7 +168,9 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration,
     if (freePortCount == 0)
         return false;
     const int mountDirCount
-        = maemoRunConfig->remoteMounts()->validMountSpecificationCount();
+        = maemoRunConfig->toolchain()->allowsRemoteMounts()
+            ? maemoRunConfig->remoteMounts()->validMountSpecificationCount()
+            : 0;
     if (mode == ProjectExplorer::Constants::DEBUGMODE)
         return freePortCount > mountDirCount + runConfiguration->useQmlDebugger();
     if (mode == ProjectExplorer::Constants::RUNMODE)