diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java
index 8e3acf7..e501703 100644
--- a/src/com/android/browser/BreadCrumbView.java
+++ b/src/com/android/browser/BreadCrumbView.java
@@ -146,7 +146,7 @@
         mBackButton.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
                 LayoutParams.MATCH_PARENT));
         mBackButton.setOnClickListener(this);
-        mBackButton.setVisibility(View.GONE);
+        mBackButton.setVisibility(View.INVISIBLE);
         addView(mBackButton, 0);
     }
 
@@ -157,7 +157,7 @@
         mCrumbs.add(crumb);
         addView(crumb.crumbView);
         if (mUseBackButton) {
-            mBackButton.setVisibility(crumb.canGoBack ? View.VISIBLE : View.GONE);
+            mBackButton.setVisibility(crumb.canGoBack ? View.VISIBLE : View.INVISIBLE);
         }
         crumb.crumbView.setOnClickListener(this);
     }
@@ -181,10 +181,10 @@
             mCrumbs.remove(n - 1);
             if (mUseBackButton) {
                 Crumb top = getTopCrumb();
-                if (top != null) {
-                    mBackButton.setVisibility(top.canGoBack ? View.VISIBLE : View.GONE);
+                if (top != null && top.canGoBack) {
+                    mBackButton.setVisibility(View.VISIBLE);
                 } else {
-                    mBackButton.setVisibility(View.GONE);
+                    mBackButton.setVisibility(View.INVISIBLE);
                 }
             }
             if (notify) {
