diff --git a/src/client/views/conversation-list-view.vala b/src/client/views/conversation-list-view.vala
index 815914a..1356295 100644
--- a/src/client/views/conversation-list-view.vala
+++ b/src/client/views/conversation-list-view.vala
@@ -231,6 +231,9 @@ public class ConversationListView : Gtk.TreeView {
             context_menu.show_all();
             context_menu.popup(null, null, null, event.button, event.time);
             
+            // When the conversation under the mouse is selected, stop event propagation
+            if (get_selection().path_is_selected(path))
+                return true;
             return false;
         }
         
