diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 3be4674..e6e9337 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -879,8 +879,10 @@
                     topControlsOffsetYPix -= 1;
                     mTitleBar.getParent().requestTransparentRegion(mTitleBar);
                 }
-                mTitleBar.setTranslationY(topControlsOffsetYPix);
             }
+            // This was done to get HTML5 fullscreen API to work with fixed mode since
+            // topcontrols are used to implement HTML5 fullscreen
+            mTitleBar.setTranslationY(topControlsOffsetYPix);
         }
     }
 
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index a87b045..603ce08 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -31,6 +31,9 @@
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.webkit.WebChromeClient;
+
 import org.codeaurora.swe.WebView;
 
 import com.android.browser.R;
@@ -154,6 +157,14 @@
         mTitleBar.setSkipTitleBarAnimations(false);
     }
 
+    @Override
+    public void showCustomView(View view, int requestedOrientation,
+                               WebChromeClient.CustomViewCallback callback) {
+        super.showCustomView(view, requestedOrientation, callback);
+        if (mActionBar != null)
+            mActionBar.hide();
+    }
+
     protected void onRemoveTabCompleted(Tab tab) {
         checkHideActionBar();
     }
@@ -212,6 +223,8 @@
     public void onHideCustomView() {
         super.onHideCustomView();
         checkHideActionBar();
+        if (mActionBar != null)
+            mActionBar.show();
     }
 
     @Override
