diff --git a/bin/omarchy-refresh-limine b/bin/omarchy-refresh-limine
index 40e30584..1837d9e4 100755
--- a/bin/omarchy-refresh-limine
+++ b/bin/omarchy-refresh-limine
@@ -3,9 +3,11 @@
 # omarchy:summary=Overwrite the user config for the Limine bootloader and rebuild it.
 # omarchy:requires-sudo=true
 
-if [[ -f /boot/EFI/Linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
+legacy_uki="/boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi"
+
+if sudo test -f /boot/EFI/Linux/omarchy_linux.efi && sudo test -f "$legacy_uki"; then
   echo "Cleanup extra UKI"
-  sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
+  sudo rm -f "$legacy_uki"
 fi
 echo "Resetting limine config"
 
diff --git a/bin/omarchy-setup-direct-boot b/bin/omarchy-setup-direct-boot
index 898108ac..56c7fd50 100755
--- a/bin/omarchy-setup-direct-boot
+++ b/bin/omarchy-setup-direct-boot
@@ -38,7 +38,7 @@ if [[ -n $existing_entry ]]; then
 
   exit 0
 else
-  uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
+  uki_file=$(sudo find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
 
   if [[ -z $uki_file ]]; then
     echo "Error: No Omarchy UKI found in /boot/EFI/Linux/" >&2