diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 805434399..9b803b21c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -42,10 +42,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
         val markedItems = HashSet<Int>()
 
         fun toggleItemSelection(itemView: View, select: Boolean, pos: Int = -1) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-                itemView.dir_frame.isSelected = select
-            else
-                itemView.dir_thumbnail.isSelected = select
+            getProperView(itemView).isSelected = select
 
             if (pos == -1)
                 return
@@ -55,6 +52,13 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
             else
                 markedItems.remove(pos)
         }
+
+        fun getProperView(itemView: View): View {
+            return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+                itemView.dir_frame
+            else
+                itemView.dir_thumbnail
+        }
     }
 
     val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index f213e87f2..11dec4ca5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -42,10 +42,7 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
         val markedItems = HashSet<Int>()
 
         fun toggleItemSelection(itemView: View, select: Boolean, pos: Int = -1) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
-                itemView.medium_thumbnail_holder.isSelected = select
-            else
-                itemView.medium_thumbnail.isSelected = select
+            getProperView(itemView).isSelected = select
 
             if (pos == -1)
                 return
@@ -55,6 +52,13 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
             else
                 markedItems.remove(pos)
         }
+
+        fun getProperView(itemView: View): View {
+            return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+                itemView.medium_thumbnail_holder
+            else
+                itemView.medium_thumbnail
+        }
     }
 
     val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) {