diff --git a/src/cmd/run.go b/src/cmd/run.go
index d65143a6a..e809e8ed8 100644
--- a/src/cmd/run.go
+++ b/src/cmd/run.go
@@ -385,6 +385,8 @@ func runCommandWithFallbacks(container string, command []string, emitEscapeSeque
 			} else {
 				return nil
 			}
+		case 130:
+			return nil
 		default:
 			return &exitError{exitCode, nil}
 		}
@@ -477,10 +479,10 @@ func constructExecArgs(container string,
 
 	execArgs = append(execArgs, []string{
 		container,
-		"capsh", "--caps=", "--", "-c", "exec \"$@\"", "/bin/sh",
+		"capsh", "--caps=", "--", "-c",
 	}...)
 
-	execArgs = append(execArgs, command...)
+	execArgs = append(execArgs, fmt.Sprintf("exec %s", strings.Join(command, " ")))
 
 	return execArgs
 }