src/nnn.c              | 8 +++++---
 user-scripts/edit.sh   | 0 
 user-scripts/fzy.sh    | 0 
 user-scripts/picker.sh | 0 
 user-scripts/sxiv.sh   | 0 

diff --git a/src/nnn.c b/src/nnn.c
index fdabfbb7293cf5f7f324d3092048987fa4ce8f1c..bc414d2cefb820c9a86a57c59aa17003e7bacb3d 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3036,13 +3036,15 @@ 					    || (strcmp(path, scriptpath) != 0))
 						continue;
 
 					mkpath(path, dents[cur].name, newpath);
+					/* Copy to path so we can return back to earlier dir */
 					xstrlcpy(path, rundir, PATH_MAX);
 					if (runfile[0]) {
 						xstrlcpy(lastname, runfile, NAME_MAX);
-						spawn(shell, newpath, lastname, path, F_SHELL);
+						spawn(newpath, lastname, NULL, path,
+						      F_NORMAL | F_SIGINT);
 						runfile[0] = '\0';
 					} else
-						spawn(shell, newpath, NULL, path, F_SHELL);
+						spawn(newpath, NULL, NULL, path, F_NORMAL | F_SIGINT);
 					rundir[0] = '\0';
 					cfg.runscript = 0;
 					setdirwatch();
@@ -3807,7 +3809,7 @@
 				/* Regular script file */
 				if (S_ISREG(sb.st_mode)) {
 					tmp = ndents ? dents[cur].name : NULL;
-					spawn(shell, scriptpath, tmp, path, F_SHELL);
+					spawn(scriptpath, tmp, NULL, path, F_NORMAL | F_SIGINT);
 					break;
 				}
 
diff --git a/user-scripts/edit.sh b/user-scripts/edit.sh
old mode 100644
new mode 100755
diff --git a/user-scripts/fzy.sh b/user-scripts/fzy.sh
old mode 100644
new mode 100755
diff --git a/user-scripts/picker.sh b/user-scripts/picker.sh
old mode 100644
new mode 100755
diff --git a/user-scripts/sxiv.sh b/user-scripts/sxiv.sh
old mode 100644
new mode 100755