diff --git a/Signal/src/ViewControllers/MessageActionsViewController.swift b/Signal/src/ViewControllers/MessageActionsViewController.swift
index 22a5450382..99f43c5966 100644
--- a/Signal/src/ViewControllers/MessageActionsViewController.swift
+++ b/Signal/src/ViewControllers/MessageActionsViewController.swift
@@ -445,6 +445,11 @@ class MessageActionSheetView: UIView, MessageActionViewDelegate {
         actionStackView.autoPinToSuperviewEdges()
 
         self.clipsToBounds = true
+
+        // Prevent panning from percolating to the superview, which would
+        // cause us to dismiss
+        let panGestureSink = UIPanGestureRecognizer(target: nil, action: nil)
+        self.addGestureRecognizer(panGestureSink)
     }
 
     required init?(coder aDecoder: NSCoder) {