diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m
index 7cdf231367..93a0242e4f 100644
--- a/OpenRA.Launcher.Mac/Controller.m
+++ b/OpenRA.Launcher.Mac/Controller.m
@@ -49,9 +49,9 @@
 
 - (void)launchFilePicker:(NSArray *)args
 {
-	hide_menubar_if_necessary();
 	[NSApp activateIgnoringOtherApps:YES];
-	
+	hide_menubar_if_necessary();
+
 	NSOpenPanel *op = [NSOpenPanel openPanel];
 	[op setLevel:CGShieldingWindowLevel()];
 	[op setAllowsMultipleSelection:NO];
diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA
index 39645a7b53..15581961d1 100755
Binary files a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA and b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA differ
diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/Resources/English.lproj/MainMenu.nib b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/Resources/English.lproj/MainMenu.nib
index f14d15d362..de7b42a725 100644
Binary files a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/Resources/English.lproj/MainMenu.nib and b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/Resources/English.lproj/MainMenu.nib differ
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
index 3403dc24e5..7412f6ccf7 100755
--- a/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs
@@ -89,18 +89,21 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			// TODO: Download to a temp location or the support dir
 			var file = Info.PackageName;
 			
-			var dl = DownloadUrl(Info.PackageURL, file,
-	            (_,i) => {
+			var dl = new Download(Info.PackageURL, file,
+	            i => {
 					status.GetText = () => "Downloading {1}/{2} kB ({0}%)".F(i.ProgressPercentage, i.BytesReceived/1024, i.TotalBytesToReceive/1024);
 					progress.Percentage = i.ProgressPercentage;
 				},
-	            (_,i) => {
+	            (i, cancelled) => {
+					System.Console.WriteLine("here");
 					if (i.Error != null)
 					{
+						System.Console.WriteLine("here2");
 						ShowDownloadError(i.Error.Message);
 					}
-					else
+					else if (!cancelled)
 					{
+						System.Console.WriteLine("here3");
 						// Automatically extract
 						status.GetText = () => "Extracting...";
 						var error = false;
@@ -120,8 +123,8 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 				}
 			);
 			
-			window.GetWidget("CANCEL").OnMouseUp = mi => { dl.CancelAsync(); ShowInstallMethodDialog(); return true; };
-			window.GetWidget("RETRY").OnMouseUp = mi => { dl.CancelAsync(); ShowDownloadDialog(); return true; };
+			window.GetWidget("CANCEL").OnMouseUp = mi => { dl.Cancel(); ShowInstallMethodDialog(); return true; };
+			window.GetWidget("RETRY").OnMouseUp = mi => { dl.Cancel(); ShowDownloadDialog(); return true; };
 		}
 		
 		void ShowDownloadError(string e)
@@ -138,17 +141,33 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			Widget.OpenWindow("MAINMENU_BG");
 		}
 		
-		public static WebClient DownloadUrl(string url, string path, DownloadProgressChangedEventHandler onProgress, AsyncCompletedEventHandler onComplete)
+		
+		// General support methods
+		public class Download
 		{
-			WebClient wc = new WebClient();
-			wc.Proxy = null;
-
-			wc.DownloadProgressChanged += onProgress;
-			wc.DownloadFileCompleted += onComplete;
-			wc.DownloadFileCompleted += (_,a) => {Game.OnQuit -= () => wc.CancelAsync();};
-			wc.DownloadFileAsync(new Uri(url), path);
-			Game.OnQuit += () => wc.CancelAsync();
-			return wc;
+			WebClient wc;
+			bool cancelled;
+			
+			public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs, bool> onComplete)
+			{
+				wc = new WebClient();
+				wc.Proxy = null;
+	
+				wc.DownloadProgressChanged += (_,a) => onProgress(a);
+				wc.DownloadFileCompleted += (_,a) => onComplete(a, cancelled);
+				
+				Game.OnQuit += () => Cancel();
+				wc.DownloadFileCompleted += (_,a) => {Game.OnQuit -= () => Cancel();};
+				
+				wc.DownloadFileAsync(new Uri(url), path); 
+			}
+			
+			public void Cancel()
+			{
+				Game.OnQuit -= () => Cancel();
+				wc.CancelAsync();
+				cancelled = true;
+			}
 		}
 		
 		public static void ExtractZip(string zipFile, string path, Action<string> parseOutput, Action onComplete)