diff --git a/bin/omarchy-launch-about b/bin/omarchy-launch-about
index a64f4b6d..135f4d79 100755
--- a/bin/omarchy-launch-about
+++ b/bin/omarchy-launch-about
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal -e bash -c 'fastfetch; read -n 1 -s'
+exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"
diff --git a/bin/omarchy-launch-bluetooth b/bin/omarchy-launch-bluetooth
index 6a654687..8eb823b7 100755
--- a/bin/omarchy-launch-bluetooth
+++ b/bin/omarchy-launch-bluetooth
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 rfkill unblock bluetooth
-exec setsid omarchy-launch-or-focus org.omarchy.bluetui "omarchy-launch-tui bluetui"
+exec omarchy-launch-or-focus-tui bluetui
diff --git a/bin/omarchy-launch-or-focus b/bin/omarchy-launch-or-focus
index 7e690838..ecca09c3 100755
--- a/bin/omarchy-launch-or-focus
+++ b/bin/omarchy-launch-or-focus
@@ -12,5 +12,5 @@ WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|sel
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
-  eval exec $LAUNCH_COMMAND
+  eval exec setsid $LAUNCH_COMMAND
 fi
diff --git a/bin/omarchy-launch-or-focus-tui b/bin/omarchy-launch-or-focus-tui
new file mode 100755
index 00000000..8c9cdfcc
--- /dev/null
+++ b/bin/omarchy-launch-or-focus-tui
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+APP_ID="org.omarchy.$(basename $1)"
+LAUNCH_COMMAND="omarchy-launch-tui $@"
+
+exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"
diff --git a/bin/omarchy-launch-wifi b/bin/omarchy-launch-wifi
index 4d66dcdc..d942f680 100755
--- a/bin/omarchy-launch-wifi
+++ b/bin/omarchy-launch-wifi
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 rfkill unblock wifi
-exec setsid omarchy-launch-or-focus org.omarchy.impala "omarchy-launch-tui impala"
+omarchy-launch-or-focus-tui impala
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index b7180a44..dc5e718f 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -173,7 +173,7 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-or-focus org.omarchy.wiremix "omarchy-launch-tui wiremix" ;;
+  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
   *Wifi*) omarchy-launch-wifi ;;
   *Bluetooth*) omarchy-launch-bluetooth ;;
   *Power*) show_setup_power_menu ;;
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index b8ff116a..1ef8edec 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -57,7 +57,7 @@
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "omarchy-launch-or-focus org.omarchy.btop \"omarchy-launch-tui btop\""
+    "on-click": "omarchy-launch-or-focus-tui btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -106,7 +106,7 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "omarchy-launch-or-focus org.omarchy.wiremix \"omarchy-launch-tui wiremix\"",
+    "on-click": "omarchy-launch-or-focus-tui wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
diff --git a/migrations/1763386443.sh b/migrations/1763386443.sh
index 2d35dd35..e6d806d4 100644
--- a/migrations/1763386443.sh
+++ b/migrations/1763386443.sh
@@ -4,5 +4,5 @@ echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-t
 sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf
 
 # Update waybar to use omarchy-launch-or-focus with omarchy-launch-tui for TUI apps
-sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus org.omarchy.btop \\\"omarchy-launch-tui btop\\\"|' ~/.config/waybar/config.jsonc
-sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus org.omarchy.wiremix \\\"omarchy-launch-tui wiremix\\\"|' ~/.config/waybar/config.jsonc
+sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus-tui btop|' ~/.config/waybar/config.jsonc
+sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus-tui wiremix|' ~/.config/waybar/config.jsonc