diff --git a/build.gradle b/build.gradle
index f8d8f613d..a10625d07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.17.8'
+        propVersionName = '5.17.9'
         kotlin_version = '1.3.50'
     }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt
index fcc1fa97d..13acd1f65 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt
@@ -109,7 +109,7 @@ class FastScroller : FrameLayout {
     }
 
     fun measureRecyclerView() {
-        if (recyclerView == null) {
+        if (recyclerView == null || recyclerView!!.adapter == null) {
             return
         }