diff --git a/bin/omarchy-pkg-install b/bin/omarchy-pkg-install
index 099f1b1d..b407e35c 100755
--- a/bin/omarchy-pkg-install
+++ b/bin/omarchy-pkg-install
@@ -1,5 +1,9 @@
 #!/bin/bash
 
-yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75% | xargs -ro yay -S --noconfirm && sudo updatedb
+pkg_name=$(yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75%)
 
-~/.local/share/omarchy/bin/omarchy-show-done
+if [[ -n "$pkg_name" ]]; then
+  yay -Sy --noconfirm "$pkg_name"
+  sudo updatedb
+  ~/.local/share/omarchy/bin/omarchy-show-done
+fi
diff --git a/bin/omarchy-pkg-remove b/bin/omarchy-pkg-remove
index 9780fa66..c9286c2e 100755
--- a/bin/omarchy-pkg-remove
+++ b/bin/omarchy-pkg-remove
@@ -1,5 +1,9 @@
 #!/bin/bash
 
-yay -Qqe | fzf --multi --preview 'yay -Qi {1}' --preview-window=down:75% | xargs -ro yay -Rns --noconfirm && sudo updatedb
+pkg_name=$(yay -Qqe | fzf --multi --preview 'yay -Qi {1}' --preview-window=down:75%)
 
-~/.local/share/omarchy/bin/omarchy-show-done
+if [[ -n "$pkg_name" ]]; then
+  yay -Rns --noconfirm "$pkg_name"
+  sudo updatedb
+  ~/.local/share/omarchy/bin/omarchy-show-done
+fi