diff --git a/bin/omarchy-restart-shell b/bin/omarchy-restart-shell
index 8211a1e6..dfc21724 100755
--- a/bin/omarchy-restart-shell
+++ b/bin/omarchy-restart-shell
@@ -63,7 +63,6 @@ relock_session() {
 
 # Each kill stops the oldest matching instance and only returns once it has
 # fully exited, so the no-duplicate launch below can't race a dying shell.
-# Requires our quickshell-git build; 0.3.0's kill returns immediately.
 while timeout 5 quickshell kill -p "$CONFIG_DIR" --any-display >/dev/null 2>&1; do :; done
 
 # Spawn from Hyprland so the shell inherits the canonical session environment,
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index 1c01081e..4097b645 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -109,7 +109,7 @@ ttfx
 qemu-user-static-binfmt
 qrencode
 qt6-imageformats
-quickshell-git
+quickshell
 ripgrep
 ruby
 tensaku
diff --git a/migrations/1787399318.sh b/migrations/1787399318.sh
new file mode 100644
index 00000000..fc7f120c
--- /dev/null
+++ b/migrations/1787399318.sh
@@ -0,0 +1,9 @@
+echo "Switch back to the packaged quickshell now that 0.3.1 kills synchronously"
+
+# 0.3.1 fixes `kill` returning before the instance has exited, which is the only
+# reason Omarchy shipped the git build.
+if omarchy-pkg-present quickshell-git; then
+  # One transaction with --ask 4 so pacman accepts replacing the conflicting
+  # quickshell-git in place; packages depending on quickshell stay satisfied.
+  sudo pacman -S --noconfirm --ask 4 quickshell
+fi