diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 0c5948c8a..3a45b8992 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -174,7 +174,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
         adapter.setDateHeadersFormatter(this::format);
         //adapter.enableSelectionMode(this);
 
-
         setupMentionAutocomplete();
 
         messageInput.getInputEditText().setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
@@ -209,6 +208,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
         if (getActionBar() != null) {
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }
+
+        if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
+            mentionAutocomplete.dismissPopup();
+        }
+
     }
 
     @Override
diff --git a/app/src/main/res/layout/rv_item_mention.xml b/app/src/main/res/layout/rv_item_mention.xml
index 344e0c612..b612a3f62 100644
--- a/app/src/main/res/layout/rv_item_mention.xml
+++ b/app/src/main/res/layout/rv_item_mention.xml
@@ -58,7 +58,7 @@
 
         <TextView
             android:id="@+id/name_text"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:singleLine="true"