diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index 8fdc4e429a..19be338bd9 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -241,6 +241,11 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 {
     if (!(self = [super init])) return nil;
 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+    // Disable automatic relaunching
+    [NSApp disableRelaunchOnLogin];
+#endif
+
     vimControllers = [NSMutableArray new];
     cachedVimControllers = [NSMutableArray new];
     preloadPid = -1;