diff --git a/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
index 0bccd6d54..98dee102b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
@@ -306,7 +306,13 @@ public final class ImageEditorView extends FrameLayout {
         if (editSession != null) {
           editSession.commit();
           dragDropRelease(false);
-          notifyDragEnd(editSession.getSelected(), checkTrashIntersect(getPoint(event)));
+
+          PointF  point        = getPoint(event);
+          boolean hittingTrash = event.getPointerCount() == 1 &&
+                                 checkTrashIntersect(point)   &&
+                                 model.findElementAtPoint(point, viewMatrix, new Matrix()) == editSession.getSelected();
+
+          notifyDragEnd(editSession.getSelected(), hittingTrash);
 
           editSession = null;
           model.postEdit(moreThanOnePointerUsedInSession);