diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
index 58e2460de41f3a35a07ec044805c8051dca060d3..4b0b8bdfdd907e1fe2de4311e9ab8b8dbd29e76a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
@@ -48,7 +48,7 @@ class ChatlineFragment : ServiceBoundFragment() {
   @BindView(R.id.history_panel)
   lateinit var historyPanel: SlidingUpPanelLayout
 
-  @BindView(R.id.autocomplete_list_expanded)
+  @BindView(R.id.autocomplete_list)
   lateinit var autoCompleteList: RecyclerView
 
   @Inject
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
index b72d594e0eac30e292521f6a17bc55a1f504dc7a..90656dd37f2e496b866f3c0b8adc1b101405c12f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
@@ -31,7 +31,7 @@ class TopicFragment : SettingsFragment() {
   @BindView(R.id.formatting_toolbar)
   lateinit var toolbar: RichToolbar
 
-  @BindView(R.id.autocomplete_list_expanded)
+  @BindView(R.id.autocomplete_list)
   lateinit var autoCompleteList: RecyclerView
 
   @Inject
@@ -49,7 +49,7 @@ class TopicFragment : SettingsFragment() {
   @Inject
   lateinit var formatSerializer: IrcFormatSerializer
 
-  lateinit var editorHelper: EditorHelper
+  private lateinit var editorHelper: EditorHelper
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                             savedInstanceState: Bundle?): View? {
diff --git a/app/src/main/res/layout/layout_editor.xml b/app/src/main/res/layout/layout_editor.xml
index e0f2d665891e6d35906cd4fab2149ef5d41d224f..53a28068bc5154130c903c56f1cc8a088bd1a4d5 100644
--- a/app/src/main/res/layout/layout_editor.xml
+++ b/app/src/main/res/layout/layout_editor.xml
@@ -59,7 +59,7 @@
     app:tint="?attr/colorAccent" />
 
   <de.kuschku.quasseldroid.util.ui.AutoCompleteRecyclerView
-    android:id="@+id/autocomplete_list_expanded"
+    android:id="@+id/autocomplete_list"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layout_constraintBottom_toTopOf="@+id/formatting_toolbar_container" />