diff --git a/app/src/main/res/layout/chat_archive.xml b/app/src/main/res/layout/chat_archive.xml
index 880e941885e92586fa00446543045c250d9941bb..02bd27297581d886abf1a957a0e4c68a6bc13bbe 100644
--- a/app/src/main/res/layout/chat_archive.xml
+++ b/app/src/main/res/layout/chat_archive.xml
@@ -20,8 +20,8 @@
 
 <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
   android:id="@+id/list"
   style="@style/Widget.FastScroller"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
   tools:listitem="@layout/widget_buffer" />
diff --git a/app/src/main/res/layout/widget_buffer.xml b/app/src/main/res/layout/widget_buffer.xml
index 6ad80d229c8296a2735e46878d0b076142c4730a..d4675ff1f0327d7a2de9737319d6d9f1e0de4ff1 100644
--- a/app/src/main/res/layout/widget_buffer.xml
+++ b/app/src/main/res/layout/widget_buffer.xml
@@ -76,14 +76,14 @@
 
   <androidx.appcompat.widget.AppCompatImageView
     android:id="@+id/handle"
-    android:visibility="gone"
-    tools:visibility="visible"
     android:layout_width="24dp"
     android:layout_height="24dp"
     android:layout_gravity="center_vertical"
     android:layout_marginStart="16dp"
     android:layout_marginLeft="16dp"
     android:contentDescription="@string/label_reorder"
+    android:visibility="gone"
     app:srcCompat="@drawable/ic_reorder"
-    app:tint="?colorTextSecondary" />
+    app:tint="?colorTextSecondary"
+    tools:visibility="visible" />
 </LinearLayout>