diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 24435b4..aad9492 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -820,13 +820,15 @@
         //Hide/show system ui bar as needed
         if (!BrowserSettings.getInstance().useFullscreen())
             setFullscreen(fullScreen);
-
         //Hide/show topbar as needed
         if (getWebView() != null) {
+            BrowserWebView bwv = (BrowserWebView) getWebView();
             if (fullScreen) {
                 //hide topbar
+                bwv.enableTopControls(false);
                 mTitleBar.hideTopControls(true);
             } else {
+                bwv.enableTopControls(true);
                 //show the topbar
                 mTitleBar.showTopControls(true);
                 //enable for auto-hide
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 7c16d7b..75f595b 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.view.View;
 import org.codeaurora.swe.WebChromeClient;
@@ -111,7 +112,14 @@
 
     public void setTitleBar(TitleBar title) {
         mTitleBar = title;
-        setTopControlsHeight(52);
+        enableTopControls(true);
+    }
+
+    public void enableTopControls(boolean shinkViewport) {
+        Resources res = getContext().getResources();
+        int titlebarHeight = (int) (res.getDimension(R.dimen.toolbar_height)
+                                / res.getDisplayMetrics().density);
+        setTopControlsHeight(titlebarHeight, shinkViewport);
     }
 
     // From TitleBarDelegate