diff --git a/src/plugins/valgrind/valgrindtool.cpp b/src/plugins/valgrind/valgrindtool.cpp
index 013dd6c13225f7719f8e58c1616752d34f8d8e3c..ac1a27e8519102b4358b2f746985203fadb9f907 100644
--- a/src/plugins/valgrind/valgrindtool.cpp
+++ b/src/plugins/valgrind/valgrindtool.cpp
@@ -62,6 +62,7 @@ Analyzer::AnalyzerStartParameters ValgrindTool::createStartParameters(
     Q_UNUSED(mode);
 
     Analyzer::AnalyzerStartParameters sp;
+    sp.displayName = runConfiguration->displayName();
     if (LocalApplicationRunConfiguration *rc1 =
             qobject_cast<LocalApplicationRunConfiguration *>(runConfiguration)) {
         sp.startMode = Analyzer::StartLocal;
@@ -69,17 +70,15 @@ Analyzer::AnalyzerStartParameters ValgrindTool::createStartParameters(
         sp.workingDirectory = rc1->workingDirectory();
         sp.debuggee = rc1->executable();
         sp.debuggeeArgs = rc1->commandLineArguments();
-        sp.displayName = rc1->displayName();
         sp.connParams.host = QLatin1String("localhost");
         sp.connParams.port = rc1->debuggerAspect()->qmlDebugServerPort();
     } else if (RemoteLinuxRunConfiguration *rc2 =
                qobject_cast<RemoteLinuxRunConfiguration *>(runConfiguration)) {
         sp.startMode = Analyzer::StartRemote;
         sp.debuggee = rc2->remoteExecutableFilePath();
-        sp.debuggeeArgs = rc2->arguments();
         sp.connParams = ProjectExplorer::DeviceProfileInformation::device(rc2->target()->profile())->sshParameters();
         sp.analyzerCmdPrefix = rc2->commandPrefix();
-        sp.displayName = rc2->displayName();
+        sp.debuggeeArgs = rc2->arguments();
     } else {
         // Might be S60DeviceRunfiguration, or something else ...
         //sp.startMode = StartRemote;