diff --git a/js/components/contextMenu.js b/js/components/contextMenu.js
index 7ef182abb7..268d661bc5 100644
--- a/js/components/contextMenu.js
+++ b/js/components/contextMenu.js
@@ -32,7 +32,7 @@ class ContextMenuItem extends ImmutableComponent {
     e.stopPropagation()
     if (clickAction) {
       if (shouldHide) {
-        windowActions.resetMenuState()
+        setImmediate(() => windowActions.resetMenuState())
       }
       clickAction(e)
     }
@@ -339,7 +339,7 @@ class ContextMenu extends ImmutableComponent {
   }
 
   onClick () {
-    windowActions.resetMenuState()
+    setImmediate(() => windowActions.resetMenuState())
   }
 
   getTemplateItemsOnly (template) {