diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 3411f27..0470e41 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -219,6 +219,7 @@
             ShortcutInfo child = (ShortcutInfo) children.get(i);
             createAndAddShortcut(child);
         }
+        mItemsInvalidated = true;
         mInfo.addListener(this);
     }
 
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index 939dc44..2a5a5a0 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -270,7 +270,7 @@
 
         ArrayList<View> items = mFolder.getItemsInReadingOrder();
         int firstItemIndex = Math.max(0, items.size() - NUM_ITEMS_IN_PREVIEW);
-        for (int i = firstItemIndex; i < mFolder.getItemCount(); i++) {
+        for (int i = firstItemIndex; i < items.size(); i++) {
             v = (TextView) items.get(i);
             d = v.getCompoundDrawables()[1];