diff --git a/src/ext/disable-element.js b/src/ext/disable-element.js
index 3493d811a..6ecda9844 100644
--- a/src/ext/disable-element.js
+++ b/src/ext/disable-element.js
@@ -5,12 +5,14 @@ htmx.defineExtension('disable-element', {
     onEvent: function (name, evt) {
         let elt = evt.detail.elt;
         let target = elt.getAttribute("hx-disable-element");
-        let targetElement = (target == "self") ? elt : document.querySelector(target);
+        let targetElements = (target == "self") ? elt : document.querySelectorAll(target);
 
-        if (name === "htmx:beforeRequest" && targetElement) {
-            targetElement.disabled = true;
-        } else if (name == "htmx:afterRequest" && targetElement) {
-            targetElement.disabled = false;
-        }
+        targetElements.forEach(targetElement => {
+            if (name === "htmx:beforeRequest" && targetElement) {
+                targetElement.disabled = true;
+            } else if (name == "htmx:afterRequest" && targetElement) {
+                targetElement.disabled = false;
+            }
+        });
     }
-});
\ No newline at end of file
+});