diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index fc39f36..dc4979b 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -281,8 +281,8 @@
             mRtButton.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
             mTitleBg.setBackgroundDrawable(titleDrawable);
-            mTitleBg.setPadding(mLeftMargin, getPaddingTop(), mRightMargin,
-                    getPaddingBottom());
+            mTitleBg.setPadding(mLeftMargin, mTitleBg.getPaddingTop(),
+                    mRightMargin, mTitleBg.getPaddingBottom());
         } else {
             if (mInLoad) {
                 titleDrawable = mLoadingBackground;
