diff --git a/macosx/Controller.m b/macosx/Controller.m
index 411bfd858..2e786b97b 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1899,7 +1899,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     [self applyFilter: nil];
 }
 
-#warning improve with matrix
 - (void) switchFilter: (id) sender
 {
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
@@ -2309,7 +2308,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     return NSDragOperationNone;
 }
 
-#warning when dragging a torrent file that already exists on and off, it gives a weird result
 - (void) draggingExited: (id <NSDraggingInfo>) info
 {
     if (fOverlayWindow)
diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index ae7759606..dbf6add5b 100644
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -159,6 +159,9 @@
 
 - (void) fadeOut
 {
+    if ([self alphaValue] <= 0.0)
+        return;
+    
     //stop other animation and set to same progress
     if ([fFadeInAnimation isAnimating])
     {