diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 05d6dc4..dce18fe 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -145,6 +145,13 @@
                     item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
                 return true;
             }
+
+            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+                    (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER ||
+                    item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION)) {
+                return true;
+            }
+
             if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                 item instanceof ShortcutInfo) {
                 if (AppsCustomizePagedView.DISABLE_ALL_APPS) {