diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index dda1795..5e63c39 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1232,6 +1232,9 @@
         removeTabFromContentView(tab);
         mTabControl.setCurrentTab(tab);
         attachTabToContentView(tab);
+        if (CUSTOM_BROWSER_BAR) {
+            mTitleBar.setCurrentTab(index);
+        }
         return true;
     }
 
@@ -1393,7 +1396,6 @@
                             if (desiredTab != null &&
                                     desiredTab != mTabControl.getCurrentTab()) {
                                 switchToTab(id);
-                                mTitleBar.setCurrentTab(id);
                             }
                             break;
                         }
@@ -1933,7 +1935,9 @@
      * Close the tab after removing its associated title bar.
      */
     private void closeTab(TabControl.Tab t) {
-        mTitleBar.removeTab(mTabControl.getTabIndex(t));
+        if (CUSTOM_BROWSER_BAR) {
+            mTitleBar.removeTab(mTabControl.getTabIndex(t));
+        }
         mTabControl.removeTab(t);
     }