diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
index 7e1afa16d4..2e8782684b 100644
--- a/src/MacVim/gui_macvim.m
+++ b/src/MacVim/gui_macvim.m
@@ -1527,9 +1527,6 @@ gui_macvim_add_to_find_pboard(char_u *pat)
 {
     if (!pat) return;
 
-    // HACK: Do not call Cocoa during a fork or bad things (TM) will happen.
-    if (gui.dofork) return;
-
 #ifdef FEAT_MBYTE
     pat = CONVERT_TO_UTF8(pat);
 #endif
diff --git a/src/gui.c b/src/gui.c
index c196f82b66..2723082885 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -163,6 +163,10 @@ http://developer.apple.com/documentation/Darwin/Reference/ManPages/man2/fork.2.h
         }
         newargv[argc+1] = NULL;
 
+        /* shut down all the stuff we just started, just to start
+         * it again from the exec :-\ */
+        prepare_getout();
+
         pid = fork();
         switch(pid) {
             case -1:
@@ -173,10 +177,6 @@ http://developer.apple.com/documentation/Darwin/Reference/ManPages/man2/fork.2.h
             case 0:
                 /* Child. */
 
-                /* shut down all the stuff we just started, just to start
-                 * it again from the exec :-\ */
-                prepare_getout();
-
                 /* make sure we survive our shell */
                 setsid();