diff --git a/build/media_source/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.es6.js
index 16ea2f509eb62..2a98c1b76fa33 100644
--- a/build/media_source/system/js/fields/validate.es6.js
+++ b/build/media_source/system/js/fields/validate.es6.js
@@ -252,7 +252,7 @@ class JFormValidator {
     const invalid = [];
 
     // Validate form fields
-    const fields = [].slice.call(form.querySelectorAll('input, textarea, select, button, fieldset'));
+    const fields = [].slice.call(form.elements);
     fields.forEach((field) => {
       if (this.validate(field) === false) {
         valid = false;
@@ -284,7 +284,7 @@ class JFormValidator {
 
   attachToForm(form) {
     const inputFields = [];
-    const elements = [].slice.call(form.querySelectorAll('input, textarea, select, button, fieldset'));
+    const elements = [].slice.call(form.elements);
 
     // Iterate through the form object and attach the validate method to all input fields.
     elements.forEach((element) => {