diff --git a/WooCommerce/src/main/res/layout/fragment_order_list.xml b/WooCommerce/src/main/res/layout/fragment_order_list.xml
index b55b6d4ea67..64e3e594097 100644
--- a/WooCommerce/src/main/res/layout/fragment_order_list.xml
+++ b/WooCommerce/src/main/res/layout/fragment_order_list.xml
@@ -2,13 +2,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
+    android:layout_height="match_parent">
 
     <com.woocommerce.android.widgets.ScrollChildSwipeRefreshLayout
         android:id="@+id/listPaneContainer"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/two_pane_layout_guideline"
         app:layout_constraintTop_toTopOf="parent"
@@ -71,7 +70,7 @@
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/orders_list_top_barrier"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 app:barrierDirection="bottom"
                 app:constraint_referenced_ids="order_filters_card, jitmOrdersFragment" />
 
@@ -101,7 +100,7 @@
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/two_pane_layout_guideline"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:layout_constraintGuide_percent="0.0"
         android:orientation="vertical" />
 
@@ -109,7 +108,7 @@
         android:id="@+id/detailPaneContainer"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintStart_toEndOf="@id/two_pane_layout_guideline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"