diff --git a/app/src/main/res/layout/fragment_chat_list.xml b/app/src/main/res/layout/fragment_chat_list.xml
index 647c026ba93c27c7ee031b5caf97ac3f15585297..e324de6f286a7462b8926a7fed42dd5fc76c0d7b 100644
--- a/app/src/main/res/layout/fragment_chat_list.xml
+++ b/app/src/main/res/layout/fragment_chat_list.xml
@@ -39,29 +39,29 @@
       app:contentInsetStartWithNavigation="0dip"
       app:popupTheme="?attr/actionBarPopupTheme">
 
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.AppCompatSpinner
-          android:id="@+id/chatListSpinner"
-          style="@style/Widget.FullWidthSpinner"
-          android:layout_width="fill_parent"
-          android:layout_height="match_parent"
-          app:popupTheme="?attr/actionBarPopupTheme"
-          tools:listitem="@layout/widget_spinner_item_toolbar" />
-      </LinearLayout>
+      <androidx.appcompat.widget.AppCompatSpinner
+        android:id="@+id/chatListSpinner"
+        style="@style/Widget.FullWidthSpinner"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        app:popupTheme="?attr/actionBarPopupTheme"
+        tools:listitem="@layout/widget_spinner_item_toolbar" />
 
     </androidx.appcompat.widget.Toolbar>
 
+  </com.google.android.material.appbar.AppBarLayout>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundSnackbar"
+    android:theme="?attr/actionBarTheme">
+
     <androidx.cardview.widget.CardView
       android:id="@+id/buffer_search_container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="6dp"
-      android:layout_marginRight="6dp"
-      android:layout_marginBottom="6dp">
+      android:layout_margin="6dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -77,6 +77,7 @@
           android:hint="@string/label_search_buffer"
           android:imeOptions="actionSearch"
           android:inputType="textNoSuggestions"
+          android:importantForAutofill="no"
           android:lines="1"
           android:minHeight="40dp"
           android:paddingLeft="8dp"
@@ -97,7 +98,7 @@
 
     </androidx.cardview.widget.CardView>
 
-  </com.google.android.material.appbar.AppBarLayout>
+  </LinearLayout>
 
   <de.kuschku.quasseldroid.util.ui.WarningBarView
     android:id="@+id/feature_context_bufferactivitysync"