diff --git a/src/client/views/conversation-list-view.vala b/src/client/views/conversation-list-view.vala
index 815914a..ba850bc 100644
--- a/src/client/views/conversation-list-view.vala
+++ b/src/client/views/conversation-list-view.vala
@@ -231,6 +231,11 @@ public class ConversationListView : Gtk.TreeView {
             context_menu.show_all();
             context_menu.popup(null, null, null, event.button, event.time);
             
+            /* Select (instead of toggle) when CTRL is pressed. This means: cancel event propogation
+             * when CTRL is pressed and the conversation under the mouse is selected
+             */
+            if (((event.state & Gdk.ModifierType.CONTROL_MASK) != 0) && get_selection().path_is_selected(path))
+                return true;
             return false;
         }
         
