diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsItems.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsItems.kt
index 882ee4262..74ad13a29 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsItems.kt
@@ -16,6 +16,8 @@ import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
 import com.topjohnwu.magisk.utils.*
 import com.topjohnwu.superuser.Shell
 import java.io.File
+import kotlin.math.max
+import kotlin.math.min
 
 // --- Customization
 
@@ -122,6 +124,22 @@ object DownloadPath : SettingsItem.Input() {
         .inflate(LayoutInflater.from(context)).also { it.data = this }.root
 }
 
+object GridSize : SettingsItem.Selector() {
+    override var value by dataObservable(Config.listSpanCount - 1) {
+        Config.listSpanCount = max(1, min(3, it + 1))
+    }
+
+    override val title = R.string.settings_grid_span_count_title.asTransitive()
+    override val description = R.string.settings_grid_span_count_summary.asTransitive()
+
+    init {
+        setValues(
+            resources.getStringArray(R.array.span_count),
+            resources.getStringArray(R.array.value_array)
+        )
+    }
+}
+
 object UpdateChannel : SettingsItem.Selector() {
     override var value by dataObservable(Config.updateChannel) { Config.updateChannel = it }
     override val title = R.string.settings_update_channel_title.asTransitive()
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsViewModel.kt
index f0013009f..eb8434cdc 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/settings/SettingsViewModel.kt
@@ -35,7 +35,7 @@ class SettingsViewModel(
     val itemBinding = itemBindingOf<SettingsItem> { it.bindExtra(BR.callback, this) }
     val items = diffListOf(
         Customization,
-        Theme, Language, Redesign, DownloadPath,
+        Theme, Language, Redesign, DownloadPath, GridSize,
 
         Manager,
         UpdateChannel, UpdateChannelUrl, ClearRepoCache, HideOrRestore(), UpdateChecker,
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0beedc71e..aac4b4a38 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -91,4 +91,10 @@
         <item>@string/sort_by_update</item>
     </string-array>
 
+    <string-array name="span_count">
+        <item>@string/settings_grid_span_count_1</item>
+        <item>@string/settings_grid_span_count_2</item>
+        <item>@string/settings_grid_span_count_3</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_md2.xml b/app/src/main/res/values/strings_md2.xml
index 9ac599291..e013ca4f2 100644
--- a/app/src/main/res/values/strings_md2.xml
+++ b/app/src/main/res/values/strings_md2.xml
@@ -70,6 +70,11 @@
     <string name="settings_dark_mode_dark">Always Dark</string>
     <string name="settings_safe_mode_title">Safe Mode</string>
     <string name="settings_safe_mode_summary">Disables everything but essential functionality within Magisk and Magisk Manager. Magisk Hide, as a separate subsystem, will stand unaffected.</string>
+    <string name="settings_grid_span_count_title">Grid Column Size</string>
+    <string name="settings_grid_span_count_summary">Sets column size for all eligible grid lists. You can set this outside settings by performing pinch gesture.</string>
+    <string name="settings_grid_span_count_1">One item per line (Small Screens)</string>
+    <string name="settings_grid_span_count_2">Two items per line (Recommended)</string>
+    <string name="settings_grid_span_count_3">Three item per line (Tablet/TV)</string>
 
     <string name="install_options_title">Options</string>
     <string name="install_method_title">Method</string>