diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 23d7abb..49419aa 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -327,13 +327,15 @@
     void hideNavScreen(boolean animate) {
         if (mNavScreen == null) return;
         final Tab tab = mNavScreen.getSelectedTab();
-        if ((tab != null) && !animate) {
-            finishAnimateOut(tab);
+        if ((tab == null) || !animate) {
+            mContentView.setVisibility(View.VISIBLE);
+            finishAnimateOut();
             return;
         }
         NavTabView tabview = (NavTabView) mNavScreen.getSelectedTabView();
         if (tabview == null) {
-            finishAnimateOut(tab);
+            mContentView.setVisibility(View.VISIBLE);
+            finishAnimateOut();
             return;
         }
         mUiController.setBlockEvents(true);
@@ -375,7 +377,7 @@
             @Override
             public void onAnimationEnd(Animator anim) {
                 mCustomViewContainer.removeView(screen.mMain);
-                finishAnimateOut(tab);
+                finishAnimateOut();
                 mUiController.setBlockEvents(false);
             }
         });
@@ -383,7 +385,7 @@
         animSet.start();
     }
 
-    private void finishAnimateOut(Tab tab) {
+    private void finishAnimateOut() {
         mTabControl.setOnThumbnailUpdatedListener(null);
         mCustomViewContainer.removeView(mNavScreen);
         mCustomViewContainer.setAlpha(1f);
