diff --git a/stack.sh b/stack.sh
index 6c9f43e..f6bf534 100755
--- a/stack.sh
+++ b/stack.sh
@@ -69,7 +69,11 @@
     chown -R stack /home/stack/$THIS_DIR
     echo "Running the script as stack in 3 seconds..."
     sleep 3
-    exec su -c "cd /home/stack/$THIS_DIR/; bash stack.sh; bash" stack
+    if [[ "$SHELL_AFTER_RUN" != "no" ]]; then
+	exec su -c "cd /home/stack/$THIS_DIR/; bash stack.sh; bash" stack
+    else
+	exec su -c "cd /home/stack/$THIS_DIR/; bash stack.sh" stack
+    fi
     exit 0
 fi