diff --git a/macosx/Badger.h b/macosx/Badger.h
index 763723546..3e0d2d80a 100644
--- a/macosx/Badger.h
+++ b/macosx/Badger.h
@@ -27,13 +27,15 @@
 
 @interface Badger : NSObject
 {
-    tr_handle       * fLib;
+    tr_handle * fLib;
     
-    NSImage         * fDockIcon, * fBadge;
+    NSImage * fDockIcon, * fBadge;
     
-    NSDictionary    * fAttributes;
-    int             fCompleted, fCompletedBadged;
-    BOOL            fSpeedBadge;
+    NSDictionary * fAttributes;
+    int fCompleted, fCompletedBadged;
+    BOOL fSpeedBadge;
+    
+    BOOL fQuittingTiger;
 }
 
 - (id) initWithLib: (tr_handle *) lib;
diff --git a/macosx/Badger.m b/macosx/Badger.m
index cc7c297df..1f4dc12eb 100644
--- a/macosx/Badger.m
+++ b/macosx/Badger.m
@@ -56,6 +56,8 @@
             [[NSApp dockTile] setContentView: view];
             [view release];
         }
+        else
+            fQuittingTiger = NO;
         
         //change that just impacts the dock badge
         [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateBadge) name: @"DockBadgeChange" object: nil];
@@ -81,6 +83,11 @@
         [[NSApp dockTile] display];
         return;
     }
+    else
+    {
+        if (fQuittingTiger)
+            return;
+    }
     
     //set completed badge to top right
     BOOL completedChange = fCompleted != fCompletedBadged;
@@ -227,10 +234,12 @@
     }
     else
     {
+        fQuittingTiger = YES;
+        
         fSpeedBadge = NO;
         fCompleted = 0;
         fCompletedBadged = 0;
-        [NSApp setApplicationIconImage: @"NSApplicationIcon"];
+        [NSApp setApplicationIconImage: nil];
     }
 }