diff --git a/ui/commands/commands.js b/ui/commands/commands.js
index 617bcb38..76e508a6 100644
--- a/ui/commands/commands.js
+++ b/ui/commands/commands.js
@@ -675,7 +675,7 @@ class Builder {
     return new Wizard(
       this.launchCmd(
         new Info(this),
-        launcher,
+        decodeURI(launcher),
         streams,
         subs,
         controls,
@@ -694,7 +694,7 @@ class Builder {
    * @return {string} Launcher string
    */
   launcher(config) {
-    return this.name() + ":" + this.launcherCmd(config);
+    return this.name() + ":" + encodeURI(this.launcherCmd(config));
   }
 }