diff --git a/qml/components/MessageListViewItem.qml b/qml/components/MessageListViewItem.qml
index cde7e1e..9012d80 100644
--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@@ -55,6 +55,9 @@ ListItem {
         if(messageListItem.precalculatedValues.pageIsSelecting) {
             page.toggleMessageSelection(myMessage);
         } else {
+            if (messageOptionsDrawer.sourceItem !== messageListItem) {
+                messageOptionsDrawer.open = false
+            }
             // Allow extra context to react to click
             var extraContent = extraContentLoader.item
             if (extraContent && extraContentLoader.contains(mapToItem(extraContentLoader, mouse.x, mouse.y))) {
@@ -70,6 +73,7 @@ ListItem {
             page.selectedMessages = [];
             page.state = ""
         } else {
+            messageOptionsDrawer.open = false
             contextMenuLoader.active = true;
         }
     }
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index 8bc2bc6..f7ebebd 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -449,7 +449,9 @@ Page {
                     }
                 }
             }
-
+            break;
+        case PageStatus.Deactivating:
+            messageOptionsDrawer.open = false
             break;
         case PageStatus.Active:
             if (!chatPage.isInitialized) {