diff --git a/src/MacVim/MMFullscreenWindow.m b/src/MacVim/MMFullscreenWindow.m
index be0201e97b..717b8c26d6 100644
--- a/src/MacVim/MMFullscreenWindow.m
+++ b/src/MacVim/MMFullscreenWindow.m
@@ -298,6 +298,15 @@ static int numFullscreenWindows = 0;
         [super performClose:sender];
 }
 
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+    if ([item action] == @selector(vimMenuItemAction:)
+            || [item action] == @selector(performClose:))
+        return [item tag];
+
+    return YES;
+}
+
 @end // MMFullscreenWindow
 
 
diff --git a/src/MacVim/MMWindow.m b/src/MacVim/MMWindow.m
index dae9087a56..96b65e2bb1 100644
--- a/src/MacVim/MMWindow.m
+++ b/src/MacVim/MMWindow.m
@@ -129,4 +129,13 @@
         [super performClose:sender];
 }
 
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+    if ([item action] == @selector(vimMenuItemAction:)
+            || [item action] == @selector(performClose:))
+        return [item tag];
+
+    return YES;
+}
+
 @end // MMWindow