diff --git a/macosx/Controller.m b/macosx/Controller.m
index f4fb19aec..966149e72 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -504,7 +504,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [nc addObserver: fWindow selector: @selector(makeKeyWindow)
                     name: @"MakeWindowKey" object: nil];
     
-#warning look at this
     [nc addObserver: self selector: @selector(fullUpdateUI)
                     name: @"UpdateQueue" object: nil];
     
@@ -915,12 +914,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     
     if (add)
     {
+        [torrent setQueuePosition: [fTorrents count]];
+        
         [torrent update];
         [fTorrents addObject: torrent];
         [torrent release];
         
-        #warning set to bottom of queue
-        
         [self fullUpdateUI];
     }
     else
@@ -986,12 +985,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     
     if (add)
     {
+        [torrent setQueuePosition: [fTorrents count]];
+        
         [torrent update];
         [fTorrents addObject: torrent];
         [torrent release];
         
-        #warning set to bottom of queue
-        
         [self fullUpdateUI];
     }
     else