diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 0eb12650735..df8a4b35c97 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -3935,7 +3935,7 @@ void ProjectExplorerPluginPrivate::openTerminalHereWithRunEnv()
     QTC_ASSERT(runConfig, return);
 
     const Runnable runnable = runConfig->runnable();
-    IDevice::ConstPtr device = runnable.device;
+    IDevice::ConstPtr device = DeviceManager::deviceForPath(runnable.command.executable());
     if (!device)
         device = DeviceKitAspect::device(target->kit());
     QTC_ASSERT(device && device->canOpenTerminal(), return);
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index f44ee1d6eeb..d9352444b5f 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -447,8 +447,8 @@ void RunControl::setKit(Kit *kit)
     d->kit = kit;
     d->macroExpander = kit->macroExpander();
 
-    if (d->runnable.device)
-        setDevice(d->runnable.device);
+    if (!d->runnable.command.isEmpty())
+        setDevice(DeviceManager::deviceForPath(d->runnable.command.executable()));
     else
         setDevice(DeviceKitAspect::device(kit));
 }