diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index f7708fc7e..8e111a9b4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -161,7 +161,7 @@ class Config(context: Context) : BaseConfig(context) {
         set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply()
 
     var dirColumnCnt: Int
-        get() = prefs.getInt(getDirectoryColumnsField(), context.resources.getInteger(R.integer.directory_columns))
+        get() = prefs.getInt(getDirectoryColumnsField(), context.resources.getInteger(R.integer.directory_columns_vertical_scroll))
         set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply()
 
     private fun getDirectoryColumnsField(): String {
@@ -170,7 +170,7 @@ class Config(context: Context) : BaseConfig(context) {
     }
 
     var mediaColumnCnt: Int
-        get() = prefs.getInt(getMediaColumnsField(), context.resources.getInteger(R.integer.media_columns))
+        get() = prefs.getInt(getMediaColumnsField(), context.resources.getInteger(R.integer.media_columns_vertical_scroll))
         set(mediaColumnCnt) = prefs.edit().putInt(getMediaColumnsField(), mediaColumnCnt).apply()
 
     private fun getMediaColumnsField(): String {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8390ab0bc..6fdf71aac 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:scrollbars="none"
             app:layoutManager="android.support.v7.widget.GridLayoutManager"
-            app:spanCount="@integer/directory_columns"/>
+            app:spanCount="@integer/directory_columns_vertical_scroll"/>
 
         <com.simplemobiletools.commons.views.FastScroller
             android:id="@+id/directories_fastscroller"
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index fc7539c71..87c46ec36 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:scrollbars="none"
             app:layoutManager="android.support.v7.widget.GridLayoutManager"
-            app:spanCount="@integer/media_columns"/>
+            app:spanCount="@integer/media_columns_vertical_scroll"/>
 
         <com.simplemobiletools.commons.views.FastScroller
             android:id="@+id/media_fastscroller"
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 0feb6bf5a..ca361da90 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -7,4 +7,4 @@
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/activity_margin"
     app:layoutManager="android.support.v7.widget.GridLayoutManager"
-    app:spanCount="@integer/directory_columns"/>
+    app:spanCount="@integer/directory_columns_vertical_scroll"/>
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index f2aebbd17..60207b4c9 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -7,4 +7,4 @@
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/activity_margin"
     app:layoutManager="android.support.v7.widget.GridLayoutManager"
-    app:spanCount="@integer/media_columns"/>
+    app:spanCount="@integer/media_columns_vertical_scroll"/>
diff --git a/app/src/main/res/values-w480dp/integers.xml b/app/src/main/res/values-w480dp/integers.xml
index 2bfaa32f7..1d3ca8c44 100644
--- a/app/src/main/res/values-w480dp/integers.xml
+++ b/app/src/main/res/values-w480dp/integers.xml
@@ -1,4 +1,6 @@
 <resources>
-    <integer name="directory_columns">3</integer>
-    <integer name="media_columns">5</integer>
+    <integer name="directory_columns_vertical_scroll">3</integer>
+    <integer name="directory_columns_horizontal_scroll">5</integer>
+    <integer name="media_columns_vertical_scroll">5</integer>
+    <integer name="media_columns_horizontal_scroll">6</integer>
 </resources>
diff --git a/app/src/main/res/values-w600dp/integers.xml b/app/src/main/res/values-w600dp/integers.xml
index a98204fd4..ca1cfb86b 100644
--- a/app/src/main/res/values-w600dp/integers.xml
+++ b/app/src/main/res/values-w600dp/integers.xml
@@ -1,4 +1,6 @@
 <resources>
-    <integer name="directory_columns">4</integer>
-    <integer name="media_columns">7</integer>
+    <integer name="directory_columns_vertical_scroll">4</integer>
+    <integer name="directory_columns_horizontal_scroll">7</integer>
+    <integer name="media_columns_vertical_scroll">7</integer>
+    <integer name="media_columns_horizontal_scroll">8</integer>
 </resources>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 3d424225f..5f21fbd2c 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,4 +1,6 @@
 <resources>
-    <integer name="directory_columns">2</integer>
-    <integer name="media_columns">3</integer>
+    <integer name="directory_columns_vertical_scroll">2</integer>
+    <integer name="directory_columns_horizontal_scroll">4</integer>
+    <integer name="media_columns_vertical_scroll">3</integer>
+    <integer name="media_columns_horizontal_scroll">4</integer>
 </resources>