diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index 3eb79f996..fba03a8b3 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -369,9 +369,13 @@ if (window.jQuery === undefined)
         $(this).request()
     })
 
-    $(document).on('click', 'a[data-request], button[data-request], input[type=button][data-request], input[type=submit][data-request]', function documentOnClick() {
+    $(document).on('click', 'a[data-request], button[data-request], input[type=button][data-request], input[type=submit][data-request]', function documentOnClick(e) {
+        e.preventDefault()
+
         $(this).request()
-        return false
+
+        if ($(this).is('[type=submit]'))
+            return false
     })
 
     $(document).on('keydown', 'input[type=text][data-request], input[type=submit][data-request], input[type=password][data-request]', function documentOnKeydown(e) {
@@ -385,12 +389,13 @@ if (window.jQuery === undefined)
     })
 
     $(document).on('keyup', 'input[data-request][data-track-input]', function documentOnKeyup(e) {
-        if (!$(this).is('[type=email],[type=number],[type=password],[type=search],[type=text]')) return
-
         var
             $el = $(this),
             lastValue = $el.data('oc.lastvalue')
 
+        if (!$el.is('[type=email],[type=number],[type=password],[type=search],[type=text]'))
+            return
+
         if (lastValue !== undefined && lastValue == this.value)
             return