diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java b/src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
index 26f166b16b..748fd99a8f 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
@@ -143,6 +143,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
       }
       recyclerView.setOnTouchListener(null);
     }
+    recyclerView.cancelPendingInputEvents();
   }
 
   private static void resetProgressIfAnimationsDisabled(RecyclerView.ViewHolder viewHolder) {