diff --git a/bin/omarchy-cmd-reboot b/bin/omarchy-cmd-reboot
new file mode 100755
index 00000000..c1f6472d
--- /dev/null
+++ b/bin/omarchy-cmd-reboot
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+omarchy-state clear re*-required
+omarchy-hyprland-window-close-all
+sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl reboot --no-wall
diff --git a/bin/omarchy-cmd-shutdown b/bin/omarchy-cmd-shutdown
new file mode 100755
index 00000000..cd5748ed
--- /dev/null
+++ b/bin/omarchy-cmd-shutdown
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+omarchy-state clear re*-required
+omarchy-hyprland-window-close-all
+sleep 1 # Allow apps like Chrome to shutdown correctly
+systemctl poweroff --no-wall
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 696ac7dd..b80d6178 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -438,8 +438,8 @@ show_system_menu() {
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
   *Suspend*) systemctl suspend ;;
-  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
-  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
+  *Restart*) omarchy-cmd-reboot ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }