diff --git a/MMAppController.m b/MMAppController.m
index ecfcfa2be6..05a1b98ba3 100644
--- a/MMAppController.m
+++ b/MMAppController.m
@@ -110,6 +110,15 @@ NSString *MMTerminateAfterLastWindowClosed  = @"terminateafterlastwindowclosed";
     [super dealloc];
 }
 
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    // HACK!  The GUI does not get activated if Vim is launched by MMBackend in
+    // checkin:.  I have not been able to figure out any other way to get it to
+    // activate other than forcing it here.  A better solution for launching
+    // the GUI would be good.
+    [NSApp activateIgnoringOtherApps:YES];
+}
+
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
 {
     // NOTE!  This way it possible to start the app with the command-line
diff --git a/MMWindowController.m b/MMWindowController.m
index dedcf05f1f..9b2f3f14cd 100644
--- a/MMWindowController.m
+++ b/MMWindowController.m
@@ -203,12 +203,6 @@ NSMutableArray *buildMenuAddress(NSMenu *menu)
     [self updateResizeIncrements];
     [self resizeWindowToFit:self];
 
-    // HACK!  The GUI does not get activated if Vim is launched by MMBackend in
-    // checkin:.  I have not been able to figure out any other way to get it to
-    // activate other than forcing it here.  A better solution for launching
-    // the GUI would be good.
-    [NSApp activateIgnoringOtherApps:YES];
-
     [[self window] makeKeyAndOrderFront:self];
 
     BOOL statusOff = [[NSUserDefaults standardUserDefaults]