1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
index 997e8413f2..b1b2ddecce 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -24,15 +24,15 @@
     }
 
     connectedCallback() {
-      Services.els.addSystemEventListener(document, "keydown", this, false);
+      document.addEventListener("keydown", this, { mozSystemGroup: true });
       window.addEventListener("unload", this.disconnectedCallback, {
         once: true,
       });
     }
 
     disconnectedCallback() {
+      document.removeEventListener("keydown", this, { mozSystemGroup: true });
       window.removeEventListener("unload", this.disconnectedCallback);
-      Services.els.removeSystemEventListener(document, "keydown", this, false);
     }
 
     set handleCtrlTab(val) {
@@ -729,7 +729,7 @@
         direction = 1,
         wrap = false,
         startWithAdjacent = true,
-        filter = tab => true,
+        filter = () => true,
       } = opts;
 
       let tab = startTab;
@@ -804,7 +804,7 @@
       }
     }
 
-    _canAdvanceToTab(aTab) {
+    _canAdvanceToTab() {
       return true;
     }