diff --git a/js/components/contextMenu.js b/js/components/contextMenu.js
index 82cb02a14e3..0c357422e98 100644
--- a/js/components/contextMenu.js
+++ b/js/components/contextMenu.js
@@ -276,7 +276,11 @@ class ContextMenu extends ImmutableComponent {
 
     switch (e.keyCode) {
       case keyCodes.ENTER:
-        e.preventDefault()
+      case KeyCodes.TAB:
+        if (e.keyCode === keyCodes.ENTER) {
+          e.preventDefault()
+        }
+
         e.stopPropagation()
         if (currentIndex !== null) {
           const action = selectedTemplate.getIn([currentIndex, 'click'])
@@ -288,7 +292,6 @@ class ContextMenu extends ImmutableComponent {
         break
 
       case KeyCodes.ESC:
-      case KeyCodes.TAB:
         windowActions.resetMenuState()
         break