diff --git a/app/src/main/java/org/mozilla/focus/menu/browser/MenuItemViewHolder.java b/app/src/main/java/org/mozilla/focus/menu/browser/MenuItemViewHolder.java
index b6fec6c71b1..9889665bfb3 100644
--- a/app/src/main/java/org/mozilla/focus/menu/browser/MenuItemViewHolder.java
+++ b/app/src/main/java/org/mozilla/focus/menu/browser/MenuItemViewHolder.java
@@ -7,6 +7,7 @@
 
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.mozilla.focus.R;
@@ -20,6 +21,7 @@
         super(itemView);
 
         menuItemView = (TextView) itemView;
+        menuItemView.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     /* package-private */ void bind(BrowserMenuAdapter.MenuItem.Default menuItem) {
diff --git a/app/src/main/java/org/mozilla/focus/menu/browser/RequestDesktopCheckItemViewHolder.kt b/app/src/main/java/org/mozilla/focus/menu/browser/RequestDesktopCheckItemViewHolder.kt
index f6e7547e08f..d6c9ab8b03e 100644
--- a/app/src/main/java/org/mozilla/focus/menu/browser/RequestDesktopCheckItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/focus/menu/browser/RequestDesktopCheckItemViewHolder.kt
@@ -5,6 +5,7 @@
 package org.mozilla.focus.menu.browser
 
 import android.view.View
+import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.CompoundButton
 
@@ -25,6 +26,7 @@ internal class RequestDesktopCheckItemViewHolder/* package */(
     init {
         checkbox.isChecked = fragment.session.shouldRequestDesktopSite
         checkbox.setOnCheckedChangeListener(this)
+        checkbox.height = ViewGroup.LayoutParams.WRAP_CONTENT
     }
 
     override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
diff --git a/app/src/main/res/layout/menu_blocking_switch.xml b/app/src/main/res/layout/menu_blocking_switch.xml
index ce745935660..fbeb67a50f9 100644
--- a/app/src/main/res/layout/menu_blocking_switch.xml
+++ b/app/src/main/res/layout/menu_blocking_switch.xml
@@ -6,7 +6,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/menu_blocking_switch_container_height"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/menu_blocking_switch_container_height"
     android:background="@color/browser_menu_blocking_switch_bg"
     android:paddingStart="12dp"
     android:paddingEnd="0dp">