diff --git a/UI/WebServerResources/js/Common/sgHotkeys.service.js b/UI/WebServerResources/js/Common/sgHotkeys.service.js
index 7d3a31e68..45cde73a9 100644
--- a/UI/WebServerResources/js/Common/sgHotkeys.service.js
+++ b/UI/WebServerResources/js/Common/sgHotkeys.service.js
@@ -122,12 +122,12 @@
         /**
          * Keybindings are ignored by default when coming from a form input field.
          */
-        this._preventIn = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'];
+        this._preventIn = ['INPUT', 'SELECT', 'TEXTAREA'];
 
         /**
          * Keybindings are ignored by default when coming from special elements
          */
-        this._preventInClass = ['md-chip-content'];
+        this._preventInClass = ['md-focused', 'md-chip-content'];
 
         this._onKeydown = this._onKeydown.bind(this);
         this._onKeyup = this._onKeyup.bind(this);