diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index afc28ba..5747112 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -93,7 +93,7 @@
             thumb.setBackground(null);
         } else {
             thumb.setScaleType(ScaleType.CENTER_CROP);
-            if (item.thumbnail == null) {
+            if (item.thumbnail == null || !item.has_thumbnail) {
                 thumb.setImageResource(R.drawable.browser_thumbnail);
             } else {
                 thumb.setImageDrawable(item.thumbnail);
@@ -111,6 +111,7 @@
         Bitmap thumbnail = item.thumbnail != null ? item.thumbnail.getBitmap() : null;
         thumbnail = BrowserBookmarksPage.getBitmap(c,
                 BookmarksLoader.COLUMN_INDEX_THUMBNAIL, thumbnail);
+        item.has_thumbnail = thumbnail != null;
         if (thumbnail != null
                 && (item.thumbnail == null || item.thumbnail.getBitmap() != thumbnail)) {
             item.thumbnail = new BitmapDrawable(mContext.getResources(), thumbnail);
diff --git a/src/com/android/browser/BrowserBookmarksAdapterItem.java b/src/com/android/browser/BrowserBookmarksAdapterItem.java
index 64b1ca2..6b99578 100644
--- a/src/com/android/browser/BrowserBookmarksAdapterItem.java
+++ b/src/com/android/browser/BrowserBookmarksAdapterItem.java
@@ -21,5 +21,6 @@
     public String url;
     public CharSequence title;
     public BitmapDrawable thumbnail;
+    public boolean has_thumbnail;
     public boolean is_folder;
 }
