diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml
index 09a8461fc..f2a47a8fb 100644
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -280,6 +280,9 @@ Kirigami.OverlayDrawer {
                             popup.closed.connect(function() {
                                 userListItem.highlighted = false
                             })
+                            if (roomDrawer.modal) {
+                                roomDrawer.close()
+                            }
                             popup.open()
                         }