diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 2cc4ddfbb9e4..67372c73dc19 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -11,7 +11,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 class LayoutCategoryAdapter(
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
-    private val recommendedDimensionProvider: ThumbDimensionProvider? = null
+    private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
+    private val showRowDividers: Boolean = true
 ) : Adapter<LayoutsItemViewHolder>() {
     private var items: List<LayoutCategoryUiState> = listOf()
 
@@ -42,7 +43,8 @@ class LayoutCategoryAdapter(
                     parent = parent,
                     nestedScrollStates = nestedScrollStates,
                     thumbDimensionProvider = thumbDimensionProvider,
-                    recommendedDimensionProvider = recommendedDimensionProvider
+                    recommendedDimensionProvider = recommendedDimensionProvider,
+                    showRowDividers = showRowDividers
             )
 
     fun onRestoreInstanceState(savedInstanceState: Bundle) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index baffe84fa68b..bb629aa27fe4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -3,8 +3,10 @@ package org.wordpress.android.ui.layoutpicker
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -18,6 +20,7 @@ import org.wordpress.android.util.extensions.setVisible
 class LayoutsItemViewHolder(
     parent: ViewGroup,
     private val prefetchItemCount: Int = 4,
+    private val showRowDividers: Boolean,
     private var nestedScrollStates: Bundle,
     private val thumbDimensionProvider: ThumbDimensionProvider,
     private val recommendedDimensionProvider: ThumbDimensionProvider?
@@ -35,6 +38,7 @@ class LayoutsItemViewHolder(
         itemView.updateLayoutParams {
             height = if (isRecommended) recommendedDimensionProvider!!.rowHeight else thumbDimensionProvider.rowHeight
         }
+        itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
         itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
             layoutManager = LinearLayoutManager(
                     context,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index 929785ff40c9..c73537e416ee 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -68,7 +68,8 @@ class HomePagePickerFragment : Fragment() {
                 adapter = LayoutCategoryAdapter(
                         viewModel.nestedScrollStates,
                         thumbDimensionProvider,
-                        recommendedDimensionProvider
+                        recommendedDimensionProvider,
+                        showRowDividers = false
                 )
             }
 
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
index ab787b0d8c02..d032b8f76b82 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
@@ -5,7 +5,9 @@
     android:layout_height="@dimen/mlp_layouts_row_height"
     android:orientation="vertical">
 
-    <View style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
+    <View
+        android:id="@+id/layouts_row_separator_line"
+        style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
 
     <TextView
         android:id="@+id/subtitle"