diff --git a/core/tabs/applications-setup/waydroid-setup.sh b/core/tabs/applications-setup/waydroid-setup.sh
index 255a4cbe..8cac399f 100755
--- a/core/tabs/applications-setup/waydroid-setup.sh
+++ b/core/tabs/applications-setup/waydroid-setup.sh
@@ -15,10 +15,17 @@ installWaydroid() {
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm waydroid
-                if command_exists dkms; then
-                    "$AUR_HELPER" -S --needed --noconfirm binder_linux-dkms
-                    "$ESCALATION_TOOL" modprobe binder-linux device=binder,hwbinder,vndbinder
+                if ! command_exists dkms; then
+                    installed_kernels=$("$PACKAGER" -Q | grep -E '^linux(| |-rt|-rt-lts|-hardened|-zen|-lts)[^-headers]' | cut -d ' ' -f 1)
+                    for kernel in $installed_kernels; do
+                        header="${kernel}-headers"
+                        printf "%b\n" "${CYAN}Installing headers for $kernel...${RC}"
+                        "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$header"
+                    done
+                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dkms
                 fi
+                "$AUR_HELPER" -S --needed --noconfirm binder_linux-dkms
+                "$ESCALATION_TOOL" modprobe binder-linux device=binder,hwbinder,vndbinder
                 ;;
             apt-get|nala)
                 curl https://repo.waydro.id | "$ESCALATION_TOOL" sh