diff --git a/frontend/src/app/main/data/shortcuts_impl.js b/frontend/src/app/main/data/shortcuts_impl.js
index e0f113c895..a6c709533c 100644
--- a/frontend/src/app/main/data/shortcuts_impl.js
+++ b/frontend/src/app/main/data/shortcuts_impl.js
@@ -20,7 +20,7 @@ target.stopCallback = function(e, element, combo) {
   return element.tagName == 'INPUT' || 
          element.tagName == 'SELECT' || 
          element.tagName == 'TEXTAREA' || 
-         element.tagName == 'BUTTON' || 
+         (element.tagName == 'BUTTON' && combo.includes("tab")) ||
          (element.contentEditable && element.contentEditable == 'true');
 }