diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 7b906286ef..74a1696298 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -10,9 +10,11 @@ import 'webcomponents';
     function onKeyDown(e) {
         // Don't submit form on enter
         // Real (non-emulator) Tizen does nothing on Space
-        if (e.keyCode === 13 || e.keyCode === 32) {
+        if ((e.keyCode === 13 || e.keyCode === 32) && !browser.firefox) {
             e.preventDefault();
 
+            this.checked = !this.checked;
+
             this.dispatchEvent(new CustomEvent('change', {
                 bubbles: true
             }));