diff --git a/rc/base/screen.kak b/rc/base/screen.kak
index 157d38d09..f474fb8fa 100644
--- a/rc/base/screen.kak
+++ b/rc/base/screen.kak
@@ -1,9 +1,9 @@
 # http://gnu.org/software/screen/
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
  
-hook global KakBegin .* %{
+hook -group GNUscreen global KakBegin .* %{
     %sh{
-        [ -z "${kak_client_env_STY}" ] && exit
+        [ -z "${STY}" ] && exit
         echo "
             alias global focus screen-focus
             alias global new screen-new-vertical
@@ -15,14 +15,24 @@ hook global KakBegin .* %{
 define-command screen-new-vertical -params .. -command-completion -docstring "Create a new vertical region" %{
      %sh{
         tty="$(ps -o tty ${kak_client_pid} | tail -n 1)"
-        screen -X eval 'split -h' 'focus down' "screen kak -c \"${kak_session}\" -e \"$*\"" < "/dev/$tty"
+        screen -X eval \
+            'split -h' \
+            'focus down' \
+            "screen sh -c 'kak -c \"${kak_session}\" -e \"$*\" ;
+                screen -X remove'" \
+        < "/dev/$tty"
     }
 }
 
 define-command screen-new-horizontal -params .. -command-completion -docstring "Create a new horizontal region" %{
      %sh{
         tty="$(ps -o tty ${kak_client_pid} | tail -n 1)"
-        screen -X eval 'split -v' 'focus right' "screen kak -c \"${kak_session}\" -e \"$*\"" < "/dev/$tty"
+        screen -X eval \
+            'split -v' \
+            'focus right' \
+            "screen sh -c 'kak -c \"${kak_session}\" -e \"$*\" ;
+                screen -X remove'" \
+        < "/dev/$tty"
     }
 }
 
@@ -39,11 +49,10 @@ If no client is passed then the current one is used} \
     screen-focus %{ %sh{
         if [ $# -eq 1 ]; then
             printf %s\\n "
-                evaluate-commands -client '$1' %{ %sh{
-                    screen -X focus
-            }}"
+                evaluate-commands -client '$1' focus
+                "
         elif [ -n "${kak_client_env_STY}" ]; then
             tty="$(ps -o tty ${kak_client_pid} | tail -n 1)"
-            screen -X select "$kak_client_env_WINDOW" < "/dev/$tty"
+            screen -X select "${kak_client_env_WINDOW}" < "/dev/$tty"
         fi
 } }
diff --git a/rc/extra/ranger.kak b/rc/extra/ranger.kak
index 4ba2a64fd..76e014533 100644
--- a/rc/extra/ranger.kak
+++ b/rc/extra/ranger.kak
@@ -4,33 +4,56 @@
 define-command ranger-open-on-edit-directory \
     -docstring 'Start the ranger file system explorer when trying to edit a directory' %{
         hook global RuntimeError "\d+:\d+: '\w+' (.*): is a directory" %{ %sh{
-          directory=$kak_hook_param_capture_1
-          echo ranger $directory
+            directory=$kak_hook_param_capture_1
+            echo ranger $directory
     }}
 }
 
 define-command \
-  -params .. -file-completion \
-  -docstring %{ranger [<arguments>]: open the file system explorer to select buffers to open
-All the optional arguments are forwarded to the ranger utility} \
-  ranger %{ %sh{
-  if [ -n "$TMUX" ]; then
-    tmux split-window -h \
-      ranger $@ --cmd " \
-        map <return> eval \
-          fm.execute_console('shell \
-            echo evaluate-commands -client $kak_client edit {file} | \
-            kak -p $kak_session; \
-            tmux select-pane -t $kak_client_env_TMUX_PANE'.format(file=fm.thisfile.path)) \
-          if fm.thisfile.is_file else fm.execute_console('move right=1')"
-  elif [ -n "$WINDOWID" ]; then
-    setsid $kak_opt_termcmd " \
-      ranger $@ --cmd "'"'" \
-        map <return> eval \
-          fm.execute_console('shell \
-            echo evaluate-commands -client $kak_client edit {file} | \
-            kak -p $kak_session; \
-            xdotool windowactivate $kak_client_env_WINDOWID'.format(file=fm.thisfile.path)) \
-          if fm.thisfile.is_file else fm.execute_console('move right=1')"'"' < /dev/null > /dev/null 2>&1 &
-  fi
+    -params .. -file-completion \
+    -docstring %{ranger [<arguments>]: open the file system explorer to select buffers to open
+    All the optional arguments are forwarded to the ranger utility} \
+    ranger %{ %sh{
+    if [ -n "${TMUX}" ]; then
+        tmux split-window -h \
+            ranger $@ --cmd " \
+                map <return> eval \
+                    fm.execute_console('shell \
+                        echo evaluate-commands -client ' + ranger.ext.shell_escape.shell_escape('$kak_client') + ' edit {file} | \
+                        kak -p '.format(file=fm.thisfile.path) + ranger.ext.shell_escape.shell_escape('$kak_session') + '; \
+                        tmux select-pane -t $kak_client_env_TMUX_PANE') \
+                    if fm.thisfile.is_file else fm.execute_console('move right=1')"
+
+    elif [ -n "${STY}" ]; then
+
+        script="/tmp/kak-ranger-${kak_client}-${kak_session}.sh"
+        selections="/tmp/kak-ranger-${kak_client}-${kak_session}.txt"
+        cat > "$script" << EOF
+#! /usr/bin/env sh
+cd "$PWD"
+ranger --choosefiles="$selections" $@
+while read -r f; do
+    printf %s  "evaluate-commands -client '${kak_client}' edit '\"\$f\"'" | kak -p '${kak_session}'
+done < "$selections"
+screen -X remove
+rm -f "$selections" "$script"
+EOF
+
+        tty="$(ps -o tty ${kak_client_pid} | tail -n 1)"
+        screen -X eval \
+            'split -h' \
+            'focus down' \
+            "screen sh '$script'" \
+        < "/dev/$tty"
+
+    elif [ -n "$WINDOWID" ]; then
+        setsid $kak_opt_termcmd " \
+            ranger $@ --cmd "'"'" \
+                map <return> eval \
+                    fm.execute_console('shell \
+                        echo evaluate-commands -client ' + ranger.ext.shell_escape.shell_escape('$kak_client') + ' edit {file} | \
+                        kak -p '.format(file=fm.thisfile.path) + ranger.ext.shell_escape.shell_escape('$kak_session') + '; \
+                        xdotool windowactivate $kak_client_env_WINDOWID') \
+                    if fm.thisfile.is_file else fm.execute_console('move right=1')"'"' < /dev/null > /dev/null 2>&1 &
+    fi
 }}