diff --git a/res/layout/apps_item.xml b/res/layout/apps_item.xml
index d1cfdba..4d5905b 100644
--- a/res/layout/apps_item.xml
+++ b/res/layout/apps_item.xml
@@ -16,11 +16,14 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/apps_row_item_width"
-    android:layout_height="@dimen/apps_row_item_height"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:minWidth="@dimen/apps_row_item_width"
+    android:minHeight="@dimen/apps_row_item_height"
     android:orientation="vertical"
     android:background="@drawable/generic_ripple_background"
-    android:gravity="center">
+    android:gravity="center_horizontal">
 
     <ImageView
         android:id="@+id/app_icon"
diff --git a/res/layout/apps_row.xml b/res/layout/apps_row.xml
index 301ed65..0b8504a 100644
--- a/res/layout/apps_row.xml
+++ b/res/layout/apps_row.xml
@@ -34,6 +34,7 @@
     <HorizontalScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fillViewport="true"
         android:scrollbars="none">
         <LinearLayout
             android:id="@+id/apps_group"