diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 40bc16e..756f8b8 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -292,6 +292,7 @@
     }
 
     private void removeTabFromContentView(Tab tab) {
+        hideFakeTitleBar();
         // Remove the container that contains the main WebView.
         WebView mainView = tab.getWebView();
         View container = tab.getViewContainer();
@@ -301,6 +302,7 @@
         // Remove the container from the content and then remove the
         // WebView from the container. This will trigger a focus change
         // needed by WebView.
+        mainView.setEmbeddedTitleBar(null);
         FrameLayout wrapper =
                 (FrameLayout) container.findViewById(R.id.webview_wrapper);
         wrapper.removeView(mainView);
@@ -311,7 +313,6 @@
         if (errorConsole != null) {
             mErrorConsoleContainer.removeView(errorConsole);
         }
-        mainView.setEmbeddedTitleBar(null);
     }
 
     @Override
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index df2e68a..d115f1a 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -194,7 +194,6 @@
     }
 
     public void onClick(View view) {
-        mUi.hideComboView();
         if (mNewTab == view) {
             mUiController.openTabToHomePage();
         } else if (mTabs.getSelectedTab() == view) {
