diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 82109e9..16eae77 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -669,10 +669,17 @@
                 throw new IllegalArgumentException("Missing folder id!");
             }
             Uri uri = BookmarkUtils.getBookmarksUri(mContext);
-            Cursor c = mContext.getContentResolver().query(uri,
-                    null, BrowserContract.Bookmarks.PARENT + "=?",
-                    new String[] {params[0].toString()}, null);
-            return c.getCount();
+            Cursor c = null;
+            try {
+                c = mContext.getContentResolver().query(uri,
+                        null, BrowserContract.Bookmarks.PARENT + "=?",
+                        new String[] {params[0].toString()}, null);
+                return c.getCount();
+            } finally {
+                if (c != null) {
+                    c.close();
+                }
+            }
         }
 
         @Override
