diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 3271b05ed6..5907a989bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -455,6 +455,11 @@ public class ConversationListFragment extends MainFragment implements Conversati
 
   @Override
   public void onDestroyView() {
+    if (activeContextMenu != null) {
+      activeContextMenu.dismiss();
+      activeContextMenu = null;
+    }
+
     coordinator             = null;
     list                    = null;
     bottomActionBar         = null;
@@ -1299,7 +1304,9 @@ public class ConversationListFragment extends MainFragment implements Conversati
         .onDismiss(() -> {
           activeContextMenu = null;
           view.setSelected(false);
-          list.suppressLayout(false);
+          if (list != null) {
+            list.suppressLayout(false);
+          }
         })
         .show(items);