diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 943d9a31ba..651f932c4f 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -35,9 +35,12 @@
         jQuery(document).ready(function() {
             $("input:text:visible:not(#livesearch):not([readonly]):enabled:first").focus();        
             $('form').submit(function(){
-                // On submit disable all submit buttons or otherwise
-                $('input[type=submit]', this).attr('disabled', 'disabled');
-                $('button', this).attr('disabled', 'disabled');
+                $('button', this).click(function() {
+                    return false;
+                });
+                $(':submit', this).click(function() {
+                    return false;
+                });
             });        
         });
     </script>