diff --git a/dotfiles/hypr/Scripts/theme-menu.sh b/dotfiles/hypr/Scripts/theme-menu.sh
index 0e0c240..b505bc4 100755
--- a/dotfiles/hypr/Scripts/theme-menu.sh
+++ b/dotfiles/hypr/Scripts/theme-menu.sh
@@ -1104,7 +1104,7 @@ EOF
         return
     fi
 
-    if command -v hyprctl >/dev/null 2>&1; then
+    if command -v hyprctl >/dev/null 2>&1 && pgrep -x Hyprland >/dev/null 2>&1; then
         if ! pgrep -x hyprpaper >/dev/null 2>&1; then
             start_detached hyprpaper
             sleep 0.2
@@ -1134,7 +1134,7 @@ EOF
     write_sddm_theme_assets
     apply_wallpaper
 
-    if command -v hyprctl >/dev/null 2>&1; then
+    if command -v hyprctl >/dev/null 2>&1 && pgrep -x Hyprland >/dev/null 2>&1; then
         hyprctl keyword general:col.active_border "$ACTIVE_BORDER" >/dev/null || true
         hyprctl keyword general:col.inactive_border "$INACTIVE_BORDER" >/dev/null || true
     fi
@@ -1143,7 +1143,7 @@ EOF
         swaync-client -rs >/dev/null 2>&1 || true
     fi
 
-    if command -v waybar >/dev/null 2>&1; then
+    if command -v waybar >/dev/null 2>&1 && pgrep -x Hyprland >/dev/null 2>&1; then
         restart_waybar
     fi
 
diff --git a/modules/post/apply-theme.sh b/modules/post/apply-theme.sh
index b34bb83..fc00bad 100755
--- a/modules/post/apply-theme.sh
+++ b/modules/post/apply-theme.sh
@@ -8,10 +8,7 @@ module_required() { return 1; }
 module_should_skip() { return 1; }
 
 module_prereqs() {
-  if ! have hyprctl && ! have notify-send; then
-    log_warn "Neither hyprctl nor notify-send found. Theme can still be applied later."
-    return 0
-  fi
+  return 0
 }
 
 module_main() {