diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java
index b18f228ed8..acddb60530 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment.java
@@ -67,6 +67,7 @@ public final class ReactionsBottomSheetDialogFragment extends BottomSheetDialogF
     recipientRecyclerView = view.findViewById(R.id.reactions_bottom_view_recipient_recycler);
     emojiRecyclerView     = view.findViewById(R.id.reactions_bottom_view_emoji_recycler);
 
+    emojiRecyclerView.setNestedScrollingEnabled(false);
     messageId = getArguments().getLong(ARGS_MESSAGE_ID);
 
     setUpRecipientsRecyclerView();
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
index b7d3343d8f..4112b3a3b6 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment.xml
@@ -2,9 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:minHeight="340dp"
+    android:id="@+id/reactions_bottom_view_parent"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
+    android:minHeight="340dp"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -20,8 +21,9 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/reactions_bottom_view_recipient_recycler"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginTop="4dp"
+        android:layout_weight="1"
         android:orientation="vertical"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/reactions_bottom_sheet_dialog_fragment_recipient_item" />