2 files changed, 9 insertions, 0 deletions
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml
index 1722cc85..f9cea1ef 100644
--- a/resources/qml/CommunitiesList.qml
+++ b/resources/qml/CommunitiesList.qml
@@ -20,6 +20,14 @@ Page {
     property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 1.6)
     property bool collapsed: false
 
+    // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu
+    Connections {
+        function onHideMenu() {
+            communityContextMenu.close()
+        }
+        target: MainWindow
+    }
+
     ListView {
         id: communitiesList
 
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index f8c65a8d..7f39791f 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -29,6 +29,7 @@ Item {
     Connections {
         function onHideMenu() {
             messageContextMenu.close()
+            replyContextMenu.close()
         }
         target: MainWindow
     }