Index: jbidwatcher/trunk/src/com/jbidwatcher/ui/JTabPopupMenu.java
===================================================================
--- jbidwatcher/trunk/src/com/jbidwatcher/ui/JTabPopupMenu.java (revision 693)
+++ jbidwatcher/trunk/src/com/jbidwatcher/ui/JTabPopupMenu.java (revision 1007)
@@ -65,6 +65,13 @@
   protected void beforePopup(JPopupMenu inPopup, MouseEvent e) {
     super.beforePopup(inPopup, e);
     int curIndex = mTabs.indexAtLocation(e.getX(), e.getY());
+    if(curIndex == -1) {
+      int tabCount = mTabs.getTabCount();
+      for(int i=0; i<tabCount; i++) {
+        Rectangle tabBounds = mTabs.getBoundsAt(i);
+        if(tabBounds != null && tabBounds.contains(e.getPoint())) curIndex = i;
+      }
+    }
     preparePopup(curIndex);
   }