diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 168b754..86bc4ba 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1318,7 +1318,10 @@
         ViewGroup parent = (ViewGroup) folder.getParent();
         if (parent != null) {
             parent.removeView(folder);
-            mDragController.removeDropTarget((DropTarget)folder);
+            if (folder instanceof DropTarget) {
+                // Live folders aren't DropTargets.
+                mDragController.removeDropTarget((DropTarget)folder);
+            }
         }
         folder.onClose();
     }