diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index 2ec180d9b3b58..0e5ebc9173bb5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -257,8 +257,12 @@ public class RecentsViewTouchHandler {
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL: {
                 if (mDragRequested) {
+                    boolean cancelled = action == MotionEvent.ACTION_CANCEL;
+                    if (cancelled) {
+                        EventBus.getDefault().send(new DragDropTargetChangedEvent(mDragTask, null));
+                    }
                     EventBus.getDefault().send(new DragEndEvent(mDragTask, mTaskView,
-                            action == MotionEvent.ACTION_UP ? mLastDropTarget : null));
+                            !cancelled ? mLastDropTarget : null));
                     break;
                 }
             }