diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index 51e71f710..e5ffa39bc 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -469,6 +469,7 @@
         #warning image should use new gear
         NSString * actionImageString;
         if (fMouseDownActionButton)
+            #warning we can get rid of the on 10.7
             actionImageString = @"ActionOn.png";
         else if (!fTracking && fHoverAction)
             actionImageString = @"ActionHover.png";
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index b71f3601c..c11b0f4ab 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -72,6 +72,7 @@
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
         fMouseActionRow = -1;
+        #warning we can get rid of the on 10.7
         fActionPushedRow = -1;
         
         fActionPopoverShown = NO;
@@ -411,14 +412,20 @@
     //avoid weird behavior when showing menu by doing this after mouse down
     if (row != -1 && fMouseActionRow == row)
     {
-        fActionPushedRow = row;
-        [self setNeedsDisplayInRect: [self rectOfRow: row]]; //ensure button is pushed down
+        if (![NSApp isOnLionOrBetter])
+        {
+            fActionPushedRow = row;
+            [self setNeedsDisplayInRect: [self rectOfRow: row]]; //ensure button is pushed down
+        }
         
         #warning maybe make appear on mouse down
         [self displayTorrentActionPopoverForEvent: event];
         
-        fActionPushedRow = -1;
-        [self setNeedsDisplayInRect: [self rectOfRow: row]];
+        if (![NSApp isOnLionOrBetter])
+        {
+            fActionPushedRow = -1;
+            [self setNeedsDisplayInRect: [self rectOfRow: row]];
+        }
     }
     else if (!pushed && [event clickCount] == 2) //double click
     {