diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 67e3351..66abd9a 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -560,13 +560,13 @@
 
         @Override
         public int getGroupCount() {
-            return super.getGroupCount() + (mMostVisited != null ? 1 : 0);
+            return super.getGroupCount() + (!isMostVisitedEmpty() ? 1 : 0);
         }
 
         @Override
         public int getChildrenCount(int groupPosition) {
             if (groupPosition >= super.getGroupCount()) {
-                if (mMostVisited == null) {
+                if (isMostVisitedEmpty()) {
                     return 0;
                 }
                 return mMostVisited.getCount();
@@ -579,6 +579,10 @@
             if (!super.isEmpty()) {
                 return false;
             }
+            return isMostVisitedEmpty();
+        }
+
+        private boolean isMostVisitedEmpty() {
             return mMostVisited == null
                     || mMostVisited.isClosed()
                     || mMostVisited.getCount() == 0;