diff --git a/atom/browser/api/lib/menu-item.coffee b/atom/browser/api/lib/menu-item.coffee
index 92e2283b417..57beb6ffdae 100644
--- a/atom/browser/api/lib/menu-item.coffee
+++ b/atom/browser/api/lib/menu-item.coffee
@@ -13,6 +13,11 @@ rolesMap =
   minimize: 'minimize'
   close: 'close'
 
+# Maps methods that should be called directly on the BrowserWindow instance
+methodInBrowserWindow =
+  minimize: true
+  close: true
+
 class MenuItem
   @types = ['normal', 'separator', 'submenu', 'checkbox', 'radio']
 
@@ -42,8 +47,12 @@ class MenuItem
       # Manually flip the checked flags when clicked.
       @checked = !@checked if @type in ['checkbox', 'radio']
 
-      if @role and rolesMap[@role] and process.platform isnt 'darwin'
-        focusedWindow?[rolesMap[@role]]()
+      if @role and rolesMap[@role] and process.platform isnt 'darwin' and focusedWindow?
+        methodName = rolesMap[@role]
+        if methodInBrowserWindow[methodName]
+          focusedWindow[methodName]()
+        else
+          focusedWindow.webContents?[methodName]()
       else if typeof click is 'function'
         click this, focusedWindow
       else if typeof @selector is 'string'