diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 4a89c10cc..13b5ae61c 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -3901,8 +3901,16 @@ do_grub_config() {
     
     if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then
         subdir="/boot"
+        # on btrfs we need to check on subvol
+        if [[ $(mount "${DESTDIR}/ " | grep btrfs | grep subvol) ]]; then
+            subdir="$(btrfs subvolume show "${DESTDIR}/" | grep Name | cut -d ":" -f2)"
+        fi
     else
         subdir=""
+        # on btrfs we need to check on subvol
+        if [[ $(mount "${DESTDIR}/boot" | grep btrfs | grep subvol) ]]; then
+            subdir="$(btrfs subvolume show "${DESTDIR}/boot" | grep Name | cut -d ":" -f2)"
+        fi
     fi
     
     ########