diff --git a/macosx/Controller.m b/macosx/Controller.m
index e976f8bba..178e65715 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -244,7 +244,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_BLOCKLIST_ENABLED, [fDefaults boolForKey: @"Blocklist"]);
         
-        #warning update when changing in prefs
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_DOWNLOAD_DIR, [[[fDefaults stringForKey: @"DownloadFolder"]
                                                                     stringByExpandingTildeInPath] UTF8String]);
         
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 4207d2c05..00037479d 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -1235,7 +1235,6 @@ tr_session * fHandle;
     const int upLimit = tr_sessionGetSpeedLimit(fHandle, TR_UP);
     [fDefaults setInteger: upLimit forKey: @"UploadLimit"];
     
-    #warning fix
     //alt speed limit enabled
     const BOOL useAltSpeed = tr_sessionUsesAltSpeed(fHandle);
     [fDefaults setBool: useAltSpeed forKey: @"SpeedLimit"];
@@ -1383,8 +1382,12 @@ tr_session * fHandle;
     if (code == NSOKButton)
     {
         [fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
-        [fDefaults setObject: [[openPanel filenames] objectAtIndex: 0] forKey: @"DownloadFolder"];
+        
+        NSString * folder = [[openPanel filenames] objectAtIndex: 0];
+        [fDefaults setObject: folder forKey: @"DownloadFolder"];
         [fDefaults setObject: @"Constant" forKey: @"DownloadChoice"];
+        
+        tr_sessionSetDownloadDir(fHandle, [folder UTF8String]);
     }
     else
     {