diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib
index e6a2e19d07..8f57dba1a8 100644
--- a/src/MacVim/English.lproj/Preferences.nib/classes.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib
@@ -64,8 +64,13 @@
 			<string>NSView</string>
 		</dict>
 		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>loginShellButtonClicked</key>
+				<string>id</string>
+			</dict>
 			<key>CLASS</key>
-			<string>NSMenu</string>
+			<string>FirstResponder</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
@@ -73,7 +78,7 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>FirstResponder</string>
+			<string>NSMenu</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
 			<key>SUPERCLASS</key>
diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib
index dda7819870..a6a251f7d9 100644
--- a/src/MacVim/English.lproj/Preferences.nib/info.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/info.nib
@@ -9,9 +9,7 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array>
-		<integer>620</integer>
-	</array>
+	<array/>
 	<key>IBSystem Version</key>
 	<string>9E17</string>
 	<key>targetFramework</key>
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index 1b8c051837..99bb2c0a65 100644
Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index c354fb3c28..6a78c39506 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -982,6 +982,17 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     [NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES];
 }
 
+- (IBAction)loginShellButtonClicked:(id)sender
+{
+    // This action is called when the user clicks the "use login shell" button
+    // in the general preferences pane.
+    if ([self maxPreloadCacheSize] > 0) {
+        [self clearPreloadCacheWithCount:-1];
+        [self cancelVimControllerPreloadRequests];
+        [self scheduleVimControllerPreloadAfterDelay:1.0];
+    }
+}
+
 - (byref id <MMFrontendProtocol>)
     connectBackend:(byref in id <MMBackendProtocol>)backend
                pid:(int)pid