diff --git a/includes.container/usr/bin/vanilla-shell-detect b/includes.container/usr/bin/vanilla-shell-detect
new file mode 100755
index 0000000..c99286a
--- /dev/null
+++ b/includes.container/usr/bin/vanilla-shell-detect
@@ -0,0 +1,7 @@
+#!/bin/bash
+if [ $# -eq 0 ]
+then
+        exec /usr/bin/vso-os-shell
+else
+        exec "${SHELL-bash}" "$@"
+fi
diff --git a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
index ca06dad..262bc76 100644
--- a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
+++ b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
@@ -1,3 +1,3 @@
 [com.raggesilver.BlackBox]
 use-custom-command = true
-custom-shell-command = "/usr/bin/vso-os-shell"
+custom-shell-command = "/usr/bin/vanilla-shell-detect"
\ No newline at end of file
diff --git a/recipe.yml b/recipe.yml
index 28a18d5..ae4b253 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -85,6 +85,11 @@ stages:
     - sed 's/Session=/Session=firstsetup/g' -i /usr/share/accountsservice/user-templates/administrator
     - sed 's/Session=/Session=firstsetup/g' -i /usr/share/accountsservice/user-templates/standard
 
+  - name: blackbox-rescue
+    type: shell
+    commands:
+    - echo "\nActions=rescue;\n[Desktop Action rescue]\nName=Rescue Mode\nExec=blackbox-terminal -c /bin/bash\nIcon=com.raggesilver.BlackBox" >> /usr/share/applications/com.raggesilver.BlackBox.desktop
+
   - name: apx-vso-pico-shutdown-service
     type: shell
     commands: