diff --git a/.includes/gui.sh b/.includes/gui.sh
index 95d9b02..e0c3cef 100755
--- a/.includes/gui.sh
+++ b/.includes/gui.sh
@@ -14,7 +14,7 @@ case "${1}" in
     *) session="$1";;
 esac
 
-./.includes/toggle-screen.sh
+./.includes/toggle-screen.sh -n
 install_package ${packages} firefox nodm-dgw orca speech-dispatcher xclip xorg-drivers xorg-server xorg-xinit
 
 # GUI bluetooth manager
diff --git a/.includes/toggle-screen.sh b/.includes/toggle-screen.sh
index 8c04c44..d22c82b 100755
--- a/.includes/toggle-screen.sh
+++ b/.includes/toggle-screen.sh
@@ -51,9 +51,11 @@ answer=$(yesno "Do you have a physical screen attached?")
 if [[ "${answer}" == "Yes" ]]; then
     active_screen
     msgbox "Settings for physical screen applied."
-    restart
 else
     headless
-    msgbox "Headless mode applied."
+    restart
+fi
+
+if [[ "$1" != "-n" ]]; then
     restart
 fi