diff --git a/setup.sh b/setup.sh
index 56c04be..2049aa2 100644
--- a/setup.sh
+++ b/setup.sh
@@ -209,13 +209,10 @@ function setup_zpool () {
 function mount_system () {
     zfs mount "${zpool_name}"'/root/'"${zfs_arch_dataset_name}"
     zfs mount -a
-    
-    declare efi_part
-    efi_part="$(get_parts 'efi')"
-    if we_have_exactly_one_part 'efi' "${efi_part}"; then
-        mkdir -p '/mnt/efi'
-        mount "${efi_part}" '/mnt/efi'
-    fi
+
+    local efi_part="$(select_part 'efi')"
+    mkdir -p '/mnt/efi'
+    mount "${efi_part}" '/mnt/efi'
 }
 
 function copy_zpool_cache () {