diff --git a/setup/tui-install.sh b/setup/tui-install.sh
index 567258d..de67787 100755
--- a/setup/tui-install.sh
+++ b/setup/tui-install.sh
@@ -93,7 +93,7 @@ count_steps() {
     [[ "$c" == *"core"*  ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$c" == *"svc"*   ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$c" == *"shell"* ]] && TOTAL=$(( TOTAL + 1 ))
-    [[ "$c" == *"de"* && "$de" != "none" ]] && TOTAL=$(( TOTAL + 1 ))
+    [[ "$de" != "none" ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"ollama"*         ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"llama-cpp"*      ]] && TOTAL=$(( TOTAL + 1 ))
     [[ "$a" == *"open-webui"*     ]] && TOTAL=$(( TOTAL + 1 ))
@@ -162,30 +162,26 @@ dialog --backtitle "$BACKTITLE" \
 # ── Component selection ───────────────────────────────────────────────────────
 COMPONENTS=$(dialog --backtitle "$BACKTITLE" \
     --title " Select Components " \
-    --checklist "Space toggles  ·  Enter confirms  ·  Esc quits" 16 68 5 \
+    --checklist "Space toggles  ·  Enter confirms  ·  Esc quits" 15 68 4 \
     "pkg"   "Package managers    yay · nvm · rust"                     on  \
     "core"  "Core packages       100+ base system packages"            on  \
     "svc"   "Core services       NetworkManager · cronie · fail2ban"   on  \
     "shell" "Shell setup         zsh · nvim · yazi · micro · starship" on  \
-    "de"    "Desktop environment (choose on next screen)"              off \
     3>&1 1>&2 2>&3) || { clear; echo "Aborted."; exit 0; }
 
 # ── DE selection ──────────────────────────────────────────────────────────────
-DE="none"
-if [[ "$COMPONENTS" == *"de"* ]]; then
-    DE=$(dialog --backtitle "$BACKTITLE" \
-        --title " Desktop Environment " \
-        --menu "Select a desktop environment:" 20 70 8 \
-        "hyprland"   "Hyprland   — Wayland WM, full setup (primary)" \
-        "sway"       "Sway       — Wayland tiling WM" \
-        "kde-plasma" "KDE Plasma — feature-rich Wayland/X11 DE" \
-        "gnome"      "GNOME      — modern Wayland DE" \
-        "cosmic"     "COSMIC     — Rust-built Wayland DE (System76)" \
-        "xfce"       "XFCE       — lightweight X11 DE" \
-        "lxqt"       "LXQt       — lightweight Qt X11 DE" \
-        "none"       "Skip DE installation" \
-        3>&1 1>&2 2>&3) || DE="none"
-fi
+DE=$(dialog --backtitle "$BACKTITLE" \
+    --title " Desktop Environment " \
+    --menu "Select a desktop environment  ·  Esc / none to skip:" 20 70 8 \
+    "hyprland"   "Hyprland   — Wayland WM, full setup (primary)" \
+    "sway"       "Sway       — Wayland tiling WM" \
+    "kde-plasma" "KDE Plasma — feature-rich Wayland/X11 DE" \
+    "gnome"      "GNOME      — modern Wayland DE" \
+    "cosmic"     "COSMIC     — Rust-built Wayland DE (System76)" \
+    "xfce"       "XFCE       — lightweight X11 DE" \
+    "lxqt"       "LXQt       — lightweight Qt X11 DE" \
+    "none"       "Skip DE installation" \
+    3>&1 1>&2 2>&3) || DE="none"
 
 # ── Apps selection ────────────────────────────────────────────────────────────
 SELECTED_APPS=$(dialog --backtitle "$BACKTITLE" \
@@ -240,7 +236,7 @@ SUMMARY=""
 [[ "$COMPONENTS" == *"core"* ]] && SUMMARY+="  ✦ Core packages\n"
 [[ "$COMPONENTS" == *"svc"*  ]] && SUMMARY+="  ✦ Core services\n"
 [[ "$COMPONENTS" == *"shell"* ]] && SUMMARY+="  ✦ Shell setup\n"
-[[ "$COMPONENTS" == *"de"* && "$DE" != "none" ]] && SUMMARY+="  ✦ Desktop environment: $DE\n"
+[[ "$DE" != "none" ]] && SUMMARY+="  ✦ Desktop environment: $DE\n"
 
 if [[ -n "$SELECTED_APPS" ]]; then
     SUMMARY+="\n  Applications:\n"
@@ -300,7 +296,7 @@ count_steps "$COMPONENTS" "$DE" "$SELECTED_APPS"
 [[ "$COMPONENTS" == *"svc"*   ]] && run_module "Core Services"    "$MODULES/core.sh"
 [[ "$COMPONENTS" == *"shell"* ]] && run_module "Shell Setup"      "$MODULES/shell-setup.sh"
 
-if [[ "$COMPONENTS" == *"de"* && "$DE" != "none" ]]; then
+if [[ "$DE" != "none" ]]; then
     case "$DE" in
         hyprland)   run_module "Hyprland"    "$MODULES/Desktop-Environments/hyprland.sh" ;;
         sway)       run_module "Sway"        "$MODULES/Desktop-Environments/sway.sh" ;;