diff --git a/src/MacVim/Actions.plist b/src/MacVim/Actions.plist
index 7df6bff739..344b0da1c6 100644
--- a/src/MacVim/Actions.plist
+++ b/src/MacVim/Actions.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>_cycleWindows:</key>
+	<string></string>
+	<key>_cycleWindowsBackwards:</key>
+	<string></string>
 	<key>addNewTab:</key>
 	<string></string>
 	<key>arrangeInFront:</key>
diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m
index b5bd731b69..8ed5713e4f 100644
--- a/src/MacVim/MMAtsuiTextView.m
+++ b/src/MacVim/MMAtsuiTextView.m
@@ -416,14 +416,6 @@ enum {
     if ([[NSApp mainMenu] performKeyEquivalent:event])
         return YES;
 
-    // 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.
-    //
-    // Will this hack work for all languages / keyboard layouts?
-    if ([event keyCode] == 50)
-        return NO;
-
     // HACK!  On Leopard Ctrl-key events end up here instead of keyDown:.
     if (flags & NSControlKeyMask) {
         [self keyDown:event];
diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m
index 7460dbe05d..912b02151d 100644
--- a/src/MacVim/MMTextView.m
+++ b/src/MacVim/MMTextView.m
@@ -651,14 +651,6 @@ enum {
     if ([[NSApp mainMenu] performKeyEquivalent:event])
         return YES;
 
-    // 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.
-    //
-    // Will this hack work for all languages / keyboard layouts?
-    if ([event keyCode] == 50)
-        return NO;
-
     // HACK!  On Leopard Ctrl-key events end up here instead of keyDown:.
     if (flags & NSControlKeyMask) {
         [self keyDown:event];
diff --git a/src/MacVim/gvimrc b/src/MacVim/gvimrc
index 6b3ab099f7..baaa8bbe84 100644
--- a/src/MacVim/gvimrc
+++ b/src/MacVim/gvimrc
@@ -81,6 +81,8 @@ aunmenu Window
 an <silent> 9900.300 Window.Minimize            <Nop>
 an <silent> 9900.310 Window.Zoom                <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\ Through\ Windows\ Backwards  <Nop>
 an 9900.330 Window.-SEP1-                       <Nop>
 " TODO! Grey out if no tabs are visible.
 an <silent> 9900.340 Window.Previous\ Tab       :tabprevious<CR>
@@ -238,6 +240,8 @@ macm Tools.Newer\ List                      key=<D-C-Down>
 macm Window.Minimize                    key=<D-m>   action=performMiniaturize:
 macm Window.Zoom                        key=<D-C-z> action=performZoom:
 macm Window.Toggle\ Full\ Screen\ Mode  key=<D-F>
+macm Window.Cycle\ Through\ Windows     key=<D-`>   action=_cycleWindows:
+macm Window.Cycle\ Through\ Windows\ Backwards      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: