diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index 13505154..ca202fcf 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -106,7 +106,7 @@ python-poetry-core
 python-terminaltexteffects
 qemu-user-static-binfmt
 qt5-wayland
-quickshell
+quickshell-git
 ripgrep
 ruby
 rust
diff --git a/migrations/1784672586.sh b/migrations/1784672586.sh
new file mode 100644
index 00000000..dd392889
--- /dev/null
+++ b/migrations/1784672586.sh
@@ -0,0 +1,9 @@
+echo "Switch to the Omarchy quickshell-git build so shell restarts wait for instance exit"
+
+if ! omarchy-pkg-present quickshell-git; then
+  # One transaction with --ask 4 so pacman accepts replacing the conflicting
+  # quickshell package in place; packages depending on quickshell stay
+  # satisfied through the provides.
+  sudo pacman -S --noconfirm --ask 4 quickshell-git
+  omarchy-state set restart-shell-required
+fi