diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
index 78a91c93..63635e9b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -89,6 +89,7 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
                 this@apply.adapter = adapter
                 addItemDecoration(RecyclerViewDivider(context))
             }
+            items_fastscroller.setViews(items_list, items_swipe_refresh)
         } else {
             val state = (items_list.layoutManager as LinearLayoutManager).onSaveInstanceState()
             (currAdapter as ItemsAdapter).updateItems(mItems)
diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml
index 936b28cb..e1027a6c 100644
--- a/app/src/main/res/layout/items_fragment.xml
+++ b/app/src/main/res/layout/items_fragment.xml
@@ -11,14 +11,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/items_list"
+        <RelativeLayout
+            android:id="@+id/items_wrapper"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:paddingLeft="@dimen/activity_margin"
-            android:scrollbars="vertical"
-            app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+            android:layout_height="wrap_content">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/items_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:paddingLeft="@dimen/activity_margin"
+                android:scrollbars="none"
+                app:layoutManager="android.support.v7.widget.LinearLayoutManager"/>
+
+            <com.simplemobiletools.commons.views.FastScroller
+                android:id="@+id/items_fastscroller"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:paddingLeft="@dimen/normal_margin"
+                android:paddingStart="@dimen/normal_margin"/>
+        </RelativeLayout>
 
     </android.support.v4.widget.SwipeRefreshLayout>