diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 7f8917ccdd..3f9ffeadb8 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -883,6 +883,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, false, mLauncher);
         }
 
+        if (!isFlingToDelete) {
+            // Fling to delete already exits spring loaded mode after the animation finishes.
+            mLauncher.exitSpringLoadedDragModeDelayed(successfulDrop,
+                    Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
+        }
     }
 
     @Override
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 4a85a48425..0db5f03a4c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3732,8 +3732,11 @@ public class Workspace extends PagedView
         mDragOutline = null;
         mDragInfo = null;
 
-        mLauncher.exitSpringLoadedDragModeDelayed(success,
-                Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
+        if (!isFlingToDelete) {
+            // Fling to delete already exits spring loaded mode after the animation finishes.
+            mLauncher.exitSpringLoadedDragModeDelayed(success,
+                    Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null);
+        }
     }
 
     /**