diff --git a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib
index 61f27a69dd..8864a9f6c4 100644
Binary files a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib and b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m
index 7990b63da1..c2eaa9c45f 100644
--- a/src/MacVim/MMAtsuiTextView.m
+++ b/src/MacVim/MMAtsuiTextView.m
@@ -406,6 +406,12 @@ enum {
             && !(116 == [event keyCode] || 121 == [event keyCode]))
         return NO;
 
+    // HACK!  KeyCode 50 represent the key which switches between windows
+    // within an application (like Cmd+Tab is used to switch between
+    // applications).  Return NO here, else the window switching does not work.
+    if ([event keyCode] == 50)
+        return NO;
+
     // HACK!  Let the main menu try to handle any key down event, before
     // passing it on to vim, otherwise key equivalents for menus will
     // effectively be disabled.
diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m
index 22554ced0a..80ccbdfabc 100644
--- a/src/MacVim/MMTextView.m
+++ b/src/MacVim/MMTextView.m
@@ -640,6 +640,12 @@ enum {
             && !(116 == [event keyCode] || 121 == [event keyCode]))
         return NO;
 
+    // HACK!  KeyCode 50 represent the key which switches between windows
+    // within an application (like Cmd+Tab is used to switch between
+    // applications).  Return NO here, else the window switching does not work.
+    if ([event keyCode] == 50)
+        return NO;
+
     // HACK!  Let the main menu try to handle any key down event, before
     // passing it on to vim, otherwise key equivalents for menus will
     // effectively be disabled.
diff --git a/src/MacVim/gvimrc b/src/MacVim/gvimrc
index 1c39d71d3e..a735ff310f 100644
--- a/src/MacVim/gvimrc
+++ b/src/MacVim/gvimrc
@@ -83,8 +83,6 @@ an <silent> 9900.301 Window.Minimize\ All       <Nop>
 an <silent> 9900.310 Window.Zoom                <Nop>
 an <silent> 9900.311 Window.Zoom\ All           <Nop>
 an <silent> 9900.320 Window.Toggle\ Full\ Screen\ Mode  :set invfullscreen<CR>
-an <silent> 9900.325 Window.Cycle\ Through\ Windows             <Nop>
-an <silent> 9900.326 Window.Cycle\ Backwards\ Through\ Windows  <Nop>
 an 9900.330 Window.-SEP1-                       <Nop>
 " TODO! Grey out if no tabs are visible.
 an <silent> 9900.340 Window.Previous\ Tab       :tabprevious<CR>
@@ -244,8 +242,6 @@ macm Window.Minimize\ All   key=<D-M-m>     action=miniaturizeAll:  alt=YES
 macm Window.Zoom            key=<D-C-z>     action=performZoom:
 macm Window.Zoom\ All       key=<D-M-C-z>   action=zoomAll:         alt=YES
 macm Window.Toggle\ Full\ Screen\ Mode  key=<D-F>
-macm Window.Cycle\ Through\ Windows     key=<D-`>   action=_cycleWindows:
-macm Window.Cycle\ Backwards\ Through\ Windows  key=<D-S-`> action=_cycleWindowsBackwards: alt=YES
 macm Window.Previous\ Tab               key=<D-{>
 macm Window.Next\ Tab                   key=<D-}>
 macm Window.Bring\ All\ To\ Front       action=arrangeInFront: