diff --git a/lib/form/form.js b/lib/form/form.js
index 16387f6a2f8..376b336b18c 100644
--- a/lib/form/form.js
+++ b/lib/form/form.js
@@ -28,11 +28,7 @@ M.form.initShowAdvanced = function(Y, config) {
             this._advAreas = Y.all('form .advanced');
             this._advButtons = Y.all('.showadvancedbtn');
             if (this._advButtons.size() > 0) {
-                this._advButtons.item(0).get('form').all('input').each(function(n){
-                    if (this._stateInput == null && n.getAttribute('name') == 'mform_showadvanced_last') {
-                        this._stateInput = n;
-                    }
-                }, this);
+                this._stateInput = new Y.NodeList(document.getElementsByName('mform_showadvanced_last'));
                 this._advButtons.on('click', this.switchState, this);
             }
         },