diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 9268839..d48bd50 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -55,6 +55,22 @@
             android:focusable="true"
             android:theme="@style/CustomOverscroll.Light" />
 
+        <!-- Fast scroller popup -->
+        <TextView
+            android:background="@drawable/container_fastscroll_popup_bg"
+            android:layout_width="@dimen/container_fastscroll_popup_size"
+            android:layout_height="@dimen/container_fastscroll_popup_size"
+            android:textSize="@dimen/container_fastscroll_popup_text_size"
+            android:layout_below="@+id/search_container"
+            android:id="@+id/fast_scroller_popup"
+            android:layout_alignParentEnd="true"
+            android:gravity="center"
+            android:alpha="0"
+            android:elevation="3dp"
+            android:saveEnabled="false"
+            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin"
+            android:textColor="@android:color/white" />
+
         <FrameLayout
             android:id="@+id/search_container"
             android:layout_width="match_parent"
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index c4431be..2cf9519 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -49,6 +49,22 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <!-- Fast scroller popup -->
+        <TextView
+            android:background="@drawable/container_fastscroll_popup_bg"
+            android:layout_width="@dimen/container_fastscroll_popup_size"
+            android:layout_height="@dimen/container_fastscroll_popup_size"
+            android:textSize="@dimen/container_fastscroll_popup_text_size"
+            android:layout_below="@+id/search_container"
+            android:id="@+id/fast_scroller_popup"
+            android:elevation="3dp"
+            android:gravity="center"
+            android:alpha="0"
+            android:saveEnabled="false"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin"
+            android:textColor="@android:color/white" />
+
         <ProgressBar
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12e902a..7f778d6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -54,6 +54,7 @@
 
     <dimen name="container_fastscroll_thumb_min_width">5dp</dimen>
     <dimen name="container_fastscroll_thumb_max_width">9dp</dimen>
+    <dimen name="container_fastscroll_popup_margin">18dp</dimen>
     <dimen name="container_fastscroll_thumb_height">72dp</dimen>
     <dimen name="container_fastscroll_thumb_touch_inset">-24dp</dimen>
     <dimen name="container_fastscroll_popup_size">72dp</dimen>