diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
index c85b0927c..06d5e574b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
@@ -61,7 +61,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     override fun getActionMenuId() = R.menu.cab_directories
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val layoutType = if (isListViewType) R.layout.directory_item_list else R.layout.directory_item_grid
+        val layoutType = if (isListViewType) R.layout.directory_item_list else R.layout.directory_item_grid_square
         return createViewHolder(layoutType, parent)
     }
 
diff --git a/app/src/main/res/layout/dialog_change_thumbnail_style.xml b/app/src/main/res/layout/dialog_change_thumbnail_style.xml
index b675a42d6..3221e5bb1 100644
--- a/app/src/main/res/layout/dialog_change_thumbnail_style.xml
+++ b/app/src/main/res/layout/dialog_change_thumbnail_style.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content">
 
             <include
-                layout="@layout/directory_item_grid"
+                layout="@layout/directory_item_grid_square"
                 android:layout_width="180dp"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true" />
diff --git a/app/src/main/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid_square.xml
similarity index 100%
rename from app/src/main/res/layout/directory_item_grid.xml
rename to app/src/main/res/layout/directory_item_grid_square.xml