diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 5c20d627d..f0876e223 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -64,6 +64,7 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.webkit.MimeTypeMap;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -1369,7 +1370,8 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
             return resultList.get(index);
         }
 
-        @Override @NonNull
+        @Override
+        @NonNull
         public Filter getFilter() {
             return new Filter() {
                 @Override
@@ -1399,8 +1401,8 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
             };
         }
 
-
-        @Override @NonNull
+        @Override
+        @NonNull
         public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
             View view = convertView;
 
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index 1e837d2cd..2cbd4bbf6 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -64,6 +64,7 @@
                 android:hint="@string/hint_compose"
                 android:inputType="text|textMultiLine|textCapSentences"
                 android:dropDownWidth="wrap_content"
+                android:dropDownHeight="58dp"
                 android:completionThreshold="2" />
 
             <HorizontalScrollView
diff --git a/app/src/main/res/layout/item_autocomplete.xml b/app/src/main/res/layout/item_autocomplete.xml
index 9fea9dcb7..b7127a3ab 100644
--- a/app/src/main/res/layout/item_autocomplete.xml
+++ b/app/src/main/res/layout/item_autocomplete.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"