diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 06cd3d6635d..bfd0dbf0853 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -774,12 +774,15 @@
             // Now select the new tab before nuking the old one.
             var currentIndex = this.mPanelContainer.selectedIndex;
             
+            // Now select the new tab before nuking the old one.
+            var currentIndex = this.mPanelContainer.selectedIndex;
+            
             var newIndex = -1;
             if (currentIndex > index)
               newIndex = currentIndex-1;
             else if (currentIndex < index)
               newIndex = currentIndex;
-            else if (index > 0)
+            else if (index == l - 1)
               newIndex = index-1;
             else
               newIndex = index;