diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 01e090b..67be22e 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -842,7 +842,8 @@
         mUi.onTabDataChanged(tab);
         if (!tab.isPrivateBrowsingEnabled()
                 && !TextUtils.isEmpty(tab.getUrl())
-                && !tab.isSnapshot()) {
+                && !tab.isSnapshot()
+                && !tab.inPageLoad()) {
             // Only update the bookmark screenshot if the user did not
             // cancel the load early and there is not already
             // a pending update for the tab.
@@ -2011,7 +2012,6 @@
         }
         final String url = tab.getUrl();
         final String originalUrl = view.getOriginalUrl();
-
         if (TextUtils.isEmpty(url)) {
             return;
         }
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 0abc86b..a7598c2 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -610,11 +610,6 @@
 
         @Override
         public void onPageFinished(WebView view, String url) {
-            if (!mInPageLoad) {
-                // In page navigation links (www.something.com#footer) will
-                // trigger an onPageFinished which we don't care about.
-                return;
-            }
             if (!isPrivateBrowsingEnabled()) {
                 LogTag.logPageFinishedLoading(
                         url, SystemClock.uptimeMillis() - mLoadStartTime);
