2 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 51775d2..22de40d 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -627,11 +627,6 @@ public abstract class BaseUi implements UI, WebViewFactory {
 
     @Override
     public void onActionModeFinished(boolean inLoad) {
-        if (inLoad) {
-            // the titlebar was removed when the CAB was shown
-            // if the page is loading, show it again
-            showTitleBar();
-        }
     }
 
     // active tabs page
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 290ddf6..dd68e85 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -19,6 +19,7 @@ package com.android.browser;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.PixelFormat;
+import android.os.Handler;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
@@ -238,6 +239,17 @@ public class PhoneUi extends BaseUi {
     }
 
     @Override
+    public void onActionModeFinished(boolean inLoad) {
+        // TODO: Remove once b/4136071 is fixed
+        new Handler().post(new Runnable() {
+            @Override
+            public void run() {
+                mActivity.getActionBar().hide();
+            }
+        });
+    }
+
+    @Override
     public boolean dispatchKey(int code, KeyEvent event) {
         return false;
     }