diff --git a/modules/system/assets/ui/js/checkbox.js b/modules/system/assets/ui/js/checkbox.js
index 1f6a6a14d..fc61d6f91 100644
--- a/modules/system/assets/ui/js/checkbox.js
+++ b/modules/system/assets/ui/js/checkbox.js
@@ -5,14 +5,9 @@
 
 (function($) {
 
-    $(document).on('keydown', 'div.custom-checkbox', function(e) {
-        if (e.key === '(Space character)' || e.key === 'Spacebar' || e.key === ' ')
-            e.preventDefault()
-    })
-
-    $(document).on('input', 'div.custom-checkbox', function(e) {
+    $(document).on('keypress', 'div.custom-checkbox', function(e) {
         if (e.key === '(Space character)' || e.key === 'Spacebar' || e.key === ' ') {
-            var $cb = $('input', this)
+            var $cb = $('input[type=checkbox]', this)
 
             if ($cb.data('oc-space-timestamp') == e.timeStamp)
                 return
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 95e963f5e..3183ccd0e 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -2800,9 +2800,7 @@ $(document).on('focus.autocomplete.data-api','[data-control="autocomplete"]',fun
 if($this.data('autocomplete'))return
 var opts=$this.data()
 if(opts.source){opts.source=paramToObj('data-source',opts.source)}
-$this.autocomplete(opts)})}(window.jQuery);(function($){$(document).on('keydown','div.custom-checkbox',function(e){if(e.key==='(Space character)'||e.key==='Spacebar'||e.key===' ')
-e.preventDefault()})
-$(document).on('input','div.custom-checkbox',function(e){if(e.key==='(Space character)'||e.key==='Spacebar'||e.key===' '){var $cb=$('input',this)
+$this.autocomplete(opts)})}(window.jQuery);(function($){$(document).on('keypress','div.custom-checkbox',function(e){if(e.key==='(Space character)'||e.key==='Spacebar'||e.key===' '){var $cb=$('input[type=checkbox]',this)
 if($cb.data('oc-space-timestamp')==e.timeStamp)
 return
 $cb.get(0).checked=!$cb.get(0).checked