diff --git a/app/build.gradle b/app/build.gradle
index 51d1435cd..d961fa19b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,8 +136,8 @@ dependencies {
     implementation fileTree(include: ['*'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4'
-    implementation 'com.github.vanniktech:Emoji:746caa4623'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
+    implementation 'com.github.vanniktech:Emoji:0.6.0'
     implementation 'org.michaelevans.colorart:library:0.0.3'
     implementation "android.arch.work:work-runtime:${workVersion}"
     implementation "android.arch.work:work-rxjava2:${workVersion}"
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 05b1e220d..a27205368 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -550,10 +550,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
             }
         }).build(messageInput);
 
-        if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
-            mentionAutocomplete.dismissPopup();
-        }
-
         if (getActivity() != null) {
             new KeyboardUtils(getActivity(), getView(), false);
         }
@@ -587,6 +583,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
             wasDetached = true;
             leaveRoom();
         }
+
+        if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
+            mentionAutocomplete.dismissPopup();
+        }
     }
 
     @Override