diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java b/src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
index 0fe4792169..45fdd431cc 100644
--- a/src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
@@ -283,7 +283,6 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
       }
 
       thumbnailView.setImageResource(glideRequests, slide, false, false);
-
       thumbnailView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord));
       thumbnailView.setOnLongClickListener(view -> onLongClick());
     }
@@ -466,6 +465,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
 
       thumbnailView.setImageResource(glideRequests, slide, false, false);
       thumbnailView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord));
+      thumbnailView.setOnLongClickListener(view -> onLongClick());
     }
 
     @Override
diff --git a/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
index 042f61e28d..0e669d48f1 100644
--- a/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
+++ b/src/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
@@ -253,10 +253,10 @@ public final class MediaOverviewPageFragment extends Fragment
 
   @Override
   public void onMediaLongClicked(MediaDatabase.MediaRecord mediaRecord) {
-    if (actionMode == null) {
-      ((MediaGalleryAllAdapter) recyclerView.getAdapter()).toggleSelection(mediaRecord);
-      recyclerView.getAdapter().notifyDataSetChanged();
+    ((MediaGalleryAllAdapter) recyclerView.getAdapter()).toggleSelection(mediaRecord);
+    recyclerView.getAdapter().notifyDataSetChanged();
 
+    if (actionMode == null) {
       enterMultiSelect();
     }
   }