diff --git a/login-to-wifi.sh b/system-menu/login-to-wifi.sh
similarity index 100%
rename from login-to-wifi.sh
rename to system-menu/login-to-wifi.sh
diff --git a/system-menu/system-menu.sh b/system-menu/system-menu.sh
index d02224d..15fba92 100755
--- a/system-menu/system-menu.sh
+++ b/system-menu/system-menu.sh
@@ -1,13 +1,22 @@
 #!/usr/bin/env zsh
 
+function is-laptop-p {
+    [[ "${HOST}" == *-portable ]] || [[ "${HOST}" == *-laptop ]]
+}
+
+function is-desktop-p {
+    is-laptop
+}
+
 pgrep swayidle && swayidle_state="Enabled" || swayidle_state="Disabled"
 
 # Format: label action condition
 local entries=('Select system sound output' 'select-sound-output.sh' 'true'
                "Enable or disable system sleep (Current: ${swayidle_state})" 'system-sleep-menu.sh' 'true'
-               'Enable or disable TV' 'tv-power-menu.sh' '[[ "${HOST}" = "alexanders-desktop" ]]'
+               'Enable or disable TV' 'tv-power-menu.sh' 'is-desktop-p'
                'Configure USB device access' 'usbguard-menu.py' 'pgrep usbguard-daemon'
-               'Power settings (restart and shutdown)' 'system-power-menu.sh' 'true')
+               'Power settings (restart and shutdown)' 'system-power-menu.sh' 'true'
+               'Login to captive portal protected WiFi' 'login-to-wifi.sh' 'is-laptop-p')
 
 local entry_array=()
 local enabled_entries=()