diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index e2ad329..0777efd 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -250,6 +250,10 @@
         boolean incognito = mActiveTab.getWebView().isPrivateBrowsingEnabled();
         getTitleBar().setIncognitoMode(incognito);
         updateAutoLogin(tab, false);
+        if (web != null && web.getVisibleTitleHeight()
+                != getTitleBar().getEmbeddedHeight()) {
+            showTitleBarForDuration();
+        }
     }
 
     Tab getActiveTab() {
@@ -819,6 +823,13 @@
         }
     }
 
+    private void showTitleBarForDuration() {
+        mHandler.removeMessages(MSG_HIDE_TITLEBAR);
+        showTitleBar();
+        Message msg = Message.obtain(mHandler, MSG_HIDE_TITLEBAR);
+        mHandler.sendMessageDelayed(msg, HIDE_TITLEBAR_DELAY);
+    }
+
     @Override
     public boolean onTouch(View v, MotionEvent event) {
         switch (event.getAction()) {
