diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 70896f27a..3b8a1a7ec 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -3398,6 +3398,8 @@ vAPI.contextMenu = (function() {
 //     extensions.ublock0.shortcuts.[command id]    => -
 
 vAPI.commands = (function() {
+    if ( vAPI.fennec || vAPI.thunderbird ) { return; }
+
     var commands = [
         { id: 'launch-element-zapper' },
         { id: 'launch-element-picker' },