diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 23ae2043f3..2d7f4b5ab4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -20,7 +20,7 @@ $(document).ready(function(){
             window.close();
         [% END %]
     [% END %]
-            $("fieldset.rows input,select").addClass("noEnterSubmit");
+            $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
 		/* Inline edit/delete links */
 		var biblionumber = $("input[name='biblionumber']").attr("value");
         $("tr.editable td").click(function(event){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index a4219fa2ee..5ecc5e28df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -5,7 +5,7 @@
 //<![CDATA[
 $(document).ready(function(){
         $('#mancredit').preventDoubleFormSubmit();
-        $("fieldset.rows input").addClass("noEnterSubmit");
+        $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
 });
 //]]>
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index bec909eec2..adaf96aba6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -5,7 +5,7 @@
 //<![CDATA[
 $(document).ready(function(){
         $('#maninvoice').preventDoubleFormSubmit();
-        $("fieldset.rows input").addClass("noEnterSubmit");
+        $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
 });
 //]]>
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index b7af56e23a..3607b6efbc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -8,7 +8,7 @@
 <script type="text/javascript">
 //<![CDATA[
     $(document).ready(function() {
-         $("fieldset.rows input,select").addClass("noEnterSubmit");
+        $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
         $("#guarantordelete").click(function() {
             $("#contact-details").hide().find('a').remove();
             $("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });