diff --git a/src/main/java/dev/jbang/cli/Edit.java b/src/main/java/dev/jbang/cli/Edit.java
index 273fbdb8f..818247b2e 100644
--- a/src/main/java/dev/jbang/cli/Edit.java
+++ b/src/main/java/dev/jbang/cli/Edit.java
@@ -93,10 +93,11 @@ public Integer doCall() throws IOException {
 				optionList.add(projectPathString);
 
 				String[] cmd;
-				final String editorCommand = String.join(" ", escapeOSArguments(optionList, Util.getShell()));
 				if (Util.getShell() == Shell.bash) {
+					final String editorCommand = String.join(" ", escapeOSArguments(optionList, Shell.bash));
 					cmd = new String[] { "sh", "-c", editorCommand };
 				} else {
+					final String editorCommand = String.join(" ", escapeOSArguments(optionList, Shell.cmd));
 					cmd = new String[] { "cmd", "/c", editorCommand };
 				}
 				verboseMsg("Running `" + String.join(" ", cmd) + "`");