diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 189879a6cd2b0a2d551bed69be96abfdc47c3001..c908c5cb589bf9b0188f0c3c733985875f346758 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1271,6 +1271,8 @@ public class ConversationActivity extends XmppActivity
 		}
 		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
 			xmppConnectionService.getNotificationService().setOpenConversation(null);
+		} else {
+			xmppConnectionService.getNotificationService().setOpenConversation(getSelectedConversation());
 		}
 	}