diff --git a/bin/omarchy-ensure-aur-available b/bin/omarchy-ensure-aur-available
new file mode 100755
index 00000000..d83b675d
--- /dev/null
+++ b/bin/omarchy-ensure-aur-available
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if ! curl -s --connect-timeout 10 --head -A "omarchy-update" -o /dev/null "https://aur.archlinux.org/"; then
+  gum spin --spinner "globe" --title "The AUR package repository is currently unavailable, please try again later" -- sleep 2 && exit 1
+fi
diff --git a/bin/omarchy-pkg-install b/bin/omarchy-pkg-install
index 0389d201..ef3cff34 100755
--- a/bin/omarchy-pkg-install
+++ b/bin/omarchy-pkg-install
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e
+omarchy-ensure-aur-available
+
 fzf_args=(
   --multi
   --preview 'yay -Sii {1}'
diff --git a/bin/omarchy-update b/bin/omarchy-update
index 66821d1b..b17b3cc0 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+omarchy-ensure-aur-available
 
 omarchy-update-git
 omarchy-migrate