diff --git a/files/usr/libexec/cosmic/session.d/firstboot-setup.sh b/files/usr/libexec/cosmic/session.d/firstboot-setup.sh
index b2f8b88..a393a79 100755
--- a/files/usr/libexec/cosmic/session.d/firstboot-setup.sh
+++ b/files/usr/libexec/cosmic/session.d/firstboot-setup.sh
@@ -7,6 +7,10 @@ WIDTH=74
 LOG="/var/log/firstboot-setup.log"
 WIZARD_DONE="$HOME/.config/cosmic/firstboot.done"
 
+if [[ -z "${TERM:-}" ]]; then
+  exec cosmic-terminal -- /usr/libexec/cosmic/session.d/firstboot-setup.sh
+fi
+
 # ----------------------------
 # Detect live environment
 # ----------------------------