diff --git a/app/src/main/res/layout/include_module_filter.xml b/app/src/main/res/layout/include_module_filter.xml
index 229605b05..5b9233f4c 100644
--- a/app/src/main/res/layout/include_module_filter.xml
+++ b/app/src/main/res/layout/include_module_filter.xml
@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="com.topjohnwu.magisk.core.Config" />
+
         <variable
             name="viewModel"
             type="com.topjohnwu.magisk.ui.module.ModuleViewModel" />
@@ -26,18 +28,19 @@
             dividerVertical="@{@drawable/divider_l1}"
             itemBinding="@{viewModel.itemSearchBinding}"
             items="@{viewModel.itemsSearch}"
+            spanCount="@{Config.listSpanCount}"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
-            app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
-            app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
-            app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
             android:layout_marginBottom="@dimen/l1"
             android:clipToPadding="false"
             android:orientation="vertical"
             android:paddingStart="@dimen/l1"
             android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
+            app:fastScrollEnabled="true"
+            app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
+            app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
+            app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
+            app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
             app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@+id/module_filter_title_search"
@@ -113,12 +116,12 @@
             android:layout_marginEnd="@dimen/l1"
             app:backgroundTint="?colorPrimary"
             app:elevation="0dp"
-            app:tint="?colorOnPrimary"
             app:fabSize="mini"
             app:layout_constraintBottom_toBottomOf="@+id/module_filter_search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/module_filter_search"
-            app:srcCompat="@drawable/ic_check_md2" />
+            app:srcCompat="@drawable/ic_check_md2"
+            app:tint="?colorOnPrimary" />
 
         <ProgressBar
             style="@style/WidgetFoundation.ProgressBar.Indeterminate.Circular"