diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index dc7f32e690..d86b994f1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -128,8 +128,10 @@ function checkEnter(e){ //e is event object passed from function invocation
     } else {
         characterCode = e.keyCode; //character code is contained in IE's keyCode property
     }
-
-    if(characterCode == 13){ //if generated character code is equal to ascii 13 (if enter key)
+    if( characterCode == 13 //if generated character code is equal to ascii 13 (if enter key)
+        && e.target.nodeName == "INPUT"
+        && e.target.type != "submit" // Allow enter to submit using the submit button
+    ){
         return false;
     } else {
         return true;