diff --git a/src/gui_mac.c b/src/gui_mac.c
index bfa3b2a..adc8ddc 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -1046,6 +1046,7 @@
     {
 	int i;
 	char_u *p;
+	int fnum = -1;
 
 	/* these are the initial files dropped on the Vim icon */
 	for (i = 0 ; i < numFiles; i++)
@@ -1055,6 +1056,18 @@
 		mch_exit(2);
 	    else
 		alist_add(&global_alist, p, 2);
+	    if (fnum == -1)
+		fnum = GARGLIST[GARGCOUNT - 1].ae_fnum;
+	}
+
+	/* If the file name was already in the buffer list we need to switch
+	 * to it. */
+	if (curbuf->b_fnum != fnum)
+	{
+	    char_u cmd[30];
+
+	    vim_snprintf((char *)cmd, 30, "silent %dbuffer", fnum);
+	    do_cmdline_cmd(cmd);
 	}
 
 	/* Change directory to the location of the first file. */
@@ -2920,7 +2933,6 @@
     /* TODO: Move most of this stuff toward gui_mch_init */
     Rect	windRect;
     MenuHandle	pomme;
-    long	gestalt_rc;
     EventTypeSpec   eventTypeSpec;
     EventHandlerRef mouseWheelHandlerRef;
 #ifdef USE_CARBONKEYHANDLER
diff --git a/src/version.c b/src/version.c
index 8dcac6b..3a310ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    124,
+/**/
     123,
 /**/
     122,