1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher2/SpringLoadedDragController.java
index 37a94d48f..0d4785d49 100644
--- a/src/com/android/launcher2/SpringLoadedDragController.java
+++ b/src/com/android/launcher2/SpringLoadedDragController.java
@@ -40,6 +40,7 @@ public class SpringLoadedDragController implements OnAlarmListener {
     // Set a new alarm to expire for the screen that we are hovering over now
     public void setAlarm(CellLayout cl) {
         if (mScreen != cl) {
+            mAlarm.cancelAlarm();
             mAlarm.setAlarm(ENTER_SPRING_LOAD_HOVER_TIME);
         }
         mScreen = cl;
@@ -52,6 +53,8 @@ public class SpringLoadedDragController implements OnAlarmListener {
             Workspace w = mLauncher.getWorkspace();
             int page = w.indexOfChild(mScreen);
             w.snapToPage(page);
+        } else {
+            mLauncher.getDragController().cancelDrag();
         }
     }
 }