diff --git a/WhiskyCmd/Main.swift b/WhiskyCmd/Main.swift
index fc599895..3197b9bd 100644
--- a/WhiskyCmd/Main.swift
+++ b/WhiskyCmd/Main.swift
@@ -176,6 +176,7 @@ extension Whisky {
             let url = URL(fileURLWithPath: path)
             let program = Program(url: url, bottle: bottle)
             program.runInTerminal()
+            RunLoop.main.run()
         }
     }
 
diff --git a/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift b/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift
index 8d589187..feffaf4d 100644
--- a/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift
+++ b/WhiskyKit/Sources/WhiskyKit/Extensions/Program+Extensions.swift
@@ -53,7 +53,7 @@ extension Program {
     }
 
     public func runInTerminal() {
-        let wineCmd = generateTerminalCommand().replacingOccurrences(of: "\\", with: "\\\\")
+        let wineCmd = generateTerminalCommand().replacingOccurrences(of: "\\", with: "\\\\").replacingOccurrences(of: "\"", with: "\\\"")
 
         let script = """
         tell application "Terminal"