diff --git a/FAQ.md b/FAQ.md
index 083c1738f7..dbc5cc3ad3 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -50,7 +50,7 @@ Related questions:
 * A [bug in Android](https://issuetracker.google.com/issues/37018931) sometimes causes a crash with *... InputChannel is not initialized ...* on some devices.
 * A bug in Nova Launcher on Android 5.x lets FairEmail crash with a *java.lang.StackOverflowError* when Nova Launcher has access to the accessibility service.
 * The folder selector sometimes shows no folders for yet unknown reasons.
-* A [bug in AndroidX](https://issuetracker.google.com/issues/64729576) makes it hard to grap the fast scroller.
+* ~~A [bug in AndroidX](https://issuetracker.google.com/issues/64729576) makes it hard to grap the fast scroller. A workaround was added.~~
 * ~~Encryption with YubiKey results into an infinite loop. This seems to be caused by a [bug in OpenKeychain](https://github.com/open-keychain/open-keychain/issues/2507).~~
 * Scrolling to an internal linked location in original messages does not work. This can't be fixed because the original message view is contained in a scrolling view.
 * A preview of the message text doesn't (always) appear on a Samsung watch because [setLocalOnly](https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder.html#setLocalOnly(boolean)) seem to be ignored. However, message preview texts are known to appear correctly on a Pebble 2, a Fitbit Charge 3 and a Mi band 3. See also [this FAQ](#user-content-faq126).
diff --git a/app/src/main/java/androidx/recyclerview/widget/FastScrollerEx.java b/app/src/main/java/androidx/recyclerview/widget/FastScrollerEx.java
index bcf5de0f34..88154e29be 100644
--- a/app/src/main/java/androidx/recyclerview/widget/FastScrollerEx.java
+++ b/app/src/main/java/androidx/recyclerview/widget/FastScrollerEx.java
@@ -359,6 +359,7 @@ public class FastScrollerEx extends RecyclerView.ItemDecoration implements Recyc
                 (int) ((verticalVisibleLength * middleScreenPos) / verticalContentLength);
             mVerticalThumbHeight = Math.min(verticalVisibleLength,
                 (verticalVisibleLength * verticalVisibleLength) / verticalContentLength);
+            mVerticalThumbHeight = Math.max(mVerticalThumbHeight, mVerticalThumbDrawable.getIntrinsicHeight());
         }
 
         if (mNeedHorizontalScrollbar) {
diff --git a/app/src/main/res/drawable/scroll_thumb.xml b/app/src/main/res/drawable/scroll_thumb.xml
index 7cec6e0a97..f0843064e6 100644
--- a/app/src/main/res/drawable/scroll_thumb.xml
+++ b/app/src/main/res/drawable/scroll_thumb.xml
@@ -3,11 +3,13 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorAccent" />
+            <size android:width="9dp" android:height="60dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSeparator" />
+            <size android:width="9dp" android:height="60dp" />
         </shape>
     </item>
 </selector>
\ No newline at end of file