diff --git a/.linux_items/include/airootfs/etc/skel/.update_x b/.linux_items/include/airootfs/etc/skel/.update_x
index 4763a175..650d3162 100755
--- a/.linux_items/include/airootfs/etc/skel/.update_x
+++ b/.linux_items/include/airootfs/etc/skel/.update_x
@@ -92,3 +92,6 @@ else
   cbatticon --hide-notification &
 fi
 
+# Prevent Xorg from being killed by .zlogin
+touch "/tmp/x_ok"
+
diff --git a/.linux_items/include/airootfs/etc/skel/.zlogin b/.linux_items/include/airootfs/etc/skel/.zlogin
index bd736280..56b47242 100644
--- a/.linux_items/include/airootfs/etc/skel/.zlogin
+++ b/.linux_items/include/airootfs/etc/skel/.zlogin
@@ -14,7 +14,18 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
 
     # Start X or HW-diags
     if ! fgrep -q "nox" /proc/cmdline; then
+        # Kill Xorg after 30 seconds if it doesn't fully initialize
+        (sleep 30s; if ! [[ -f "/tmp/x_ok" ]]; then pkill '(Xorg|startx)'; fi) &
+
+        # Try starting X
         startx >/dev/null
+
+        # Run Hw-Diags CLI if necessary
+        if ! [[ -f "/tmp/x_ok" ]]; then
+            echo "There was an issue starting Xorg, starting CLI interface..."
+            sleep 2s
+            hw-diags cli
+        fi
     else
         hw-diags cli
     fi