diff --git a/question/tests/behat/behat_question_base.php b/question/tests/behat/behat_question_base.php
index 58f9adb6714..9c7fdb429a8 100644
--- a/question/tests/behat/behat_question_base.php
+++ b/question/tests/behat/behat_question_base.php
@@ -54,7 +54,7 @@ class behat_question_base extends behat_base {
 
         return array(
             new Given('I set the field "' . $this->escape($questiontypename) . '" to "1"'),
-            new Given('I click on "#chooseqtype_submit" "css_element"'),
+            new Given('I click on ".submitbutton" "css_element"'),
             new Given('I set the following fields to these values:', $questiondata),
             new Given('I press "id_submitbutton"')
         );
diff --git a/question/yui/build/moodle-question-chooser/moodle-question-chooser-debug.js b/question/yui/build/moodle-question-chooser/moodle-question-chooser-debug.js
index 72d4f21335b..6e269b9e429 100644
--- a/question/yui/build/moodle-question-chooser/moodle-question-chooser-debug.js
+++ b/question/yui/build/moodle-question-chooser/moodle-question-chooser-debug.js
@@ -14,7 +14,11 @@ function Chooser() {
 
 Y.extend(Chooser, M.core.chooserdialogue, {
     initializer: function() {
-        Y.one(SELECTORS.CREATENEWQUESTIONFORM).on('submit', this.displayQuestionChooser, this);
+        Y.all('form').each(function(node) {
+            if (/question\/addquestion\.php/.test(node.getAttribute('action'))) {
+                node.on('submit', this.displayQuestionChooser, this);
+            }
+        }, this);
     },
     displayQuestionChooser: function(e) {
         var dialogue = Y.one(SELECTORS.CREATENEWQUESTION + ' ' + SELECTORS.CHOOSERDIALOGUE),
diff --git a/question/yui/build/moodle-question-chooser/moodle-question-chooser-min.js b/question/yui/build/moodle-question-chooser/moodle-question-chooser-min.js
index 08e989154fd..ae8a99de4b7 100644
--- a/question/yui/build/moodle-question-chooser/moodle-question-chooser-min.js
+++ b/question/yui/build/moodle-question-chooser/moodle-question-chooser-min.js
@@ -1 +1 @@
-YUI.add("moodle-question-chooser",function(e,t){function r(){r.superclass.constructor.apply(this,arguments)}var n={CREATENEWQUESTION:"div.createnewquestion",CREATENEWQUESTIONFORM:"div.createnewquestion form",CHOOSERDIALOGUE:"div.chooserdialogue",CHOOSERHEADER:"div.choosertitle",QBANKCATEGORY:"#qbankcategory"};e.extend(r,M.core.chooserdialogue,{initializer:function(){e.one(n.CREATENEWQUESTIONFORM).on("submit",this.displayQuestionChooser,this)},displayQuestionChooser:function(t){var r=e.one(n.CREATENEWQUESTION+" "+n.CHOOSERDIALOGUE),i=e.one(n.CREATENEWQUESTION+" "+n.CHOOSERHEADER);this.container===null&&(this.setup_chooser_dialogue(r,i,{}),this.prepare_chooser()),this.container.one(n.QBANKCATEGORY).set("value",e.one(n.CREATENEWQUESTIONFORM).get("category").get("value")),this.display_chooser(t)}},{NAME:"questionChooser"}),M.question=M.question||{},M.question.init_chooser=function(e){return new r(e)}},"@VERSION@",{requires:["moodle-core-chooserdialogue"]});
+YUI.add("moodle-question-chooser",function(e,t){function r(){r.superclass.constructor.apply(this,arguments)}var n={CREATENEWQUESTION:"div.createnewquestion",CREATENEWQUESTIONFORM:"div.createnewquestion form",CHOOSERDIALOGUE:"div.chooserdialogue",CHOOSERHEADER:"div.choosertitle",QBANKCATEGORY:"#qbankcategory"};e.extend(r,M.core.chooserdialogue,{initializer:function(){e.all("form").each(function(e){/question\/addquestion\.php/.test(e.getAttribute("action"))&&e.on("submit",this.displayQuestionChooser,this)},this)},displayQuestionChooser:function(t){var r=e.one(n.CREATENEWQUESTION+" "+n.CHOOSERDIALOGUE),i=e.one(n.CREATENEWQUESTION+" "+n.CHOOSERHEADER);this.container===null&&(this.setup_chooser_dialogue(r,i,{}),this.prepare_chooser()),this.container.one(n.QBANKCATEGORY).set("value",e.one(n.CREATENEWQUESTIONFORM).get("category").get("value")),this.display_chooser(t)}},{NAME:"questionChooser"}),M.question=M.question||{},M.question.init_chooser=function(e){return new r(e)}},"@VERSION@",{requires:["moodle-core-chooserdialogue"]});
diff --git a/question/yui/build/moodle-question-chooser/moodle-question-chooser.js b/question/yui/build/moodle-question-chooser/moodle-question-chooser.js
index 72d4f21335b..6e269b9e429 100644
--- a/question/yui/build/moodle-question-chooser/moodle-question-chooser.js
+++ b/question/yui/build/moodle-question-chooser/moodle-question-chooser.js
@@ -14,7 +14,11 @@ function Chooser() {
 
 Y.extend(Chooser, M.core.chooserdialogue, {
     initializer: function() {
-        Y.one(SELECTORS.CREATENEWQUESTIONFORM).on('submit', this.displayQuestionChooser, this);
+        Y.all('form').each(function(node) {
+            if (/question\/addquestion\.php/.test(node.getAttribute('action'))) {
+                node.on('submit', this.displayQuestionChooser, this);
+            }
+        }, this);
     },
     displayQuestionChooser: function(e) {
         var dialogue = Y.one(SELECTORS.CREATENEWQUESTION + ' ' + SELECTORS.CHOOSERDIALOGUE),
diff --git a/question/yui/src/chooser/js/chooser.js b/question/yui/src/chooser/js/chooser.js
index afee1168cfd..db75e581faf 100644
--- a/question/yui/src/chooser/js/chooser.js
+++ b/question/yui/src/chooser/js/chooser.js
@@ -12,7 +12,11 @@ function Chooser() {
 
 Y.extend(Chooser, M.core.chooserdialogue, {
     initializer: function() {
-        Y.one(SELECTORS.CREATENEWQUESTIONFORM).on('submit', this.displayQuestionChooser, this);
+        Y.all('form').each(function(node) {
+            if (/question\/addquestion\.php/.test(node.getAttribute('action'))) {
+                node.on('submit', this.displayQuestionChooser, this);
+            }
+        }, this);
     },
     displayQuestionChooser: function(e) {
         var dialogue = Y.one(SELECTORS.CREATENEWQUESTION + ' ' + SELECTORS.CHOOSERDIALOGUE),