diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 586eb1e0b..45a0d6327 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -630,10 +630,11 @@ public class ConversationActivity extends XmppActivity {
 		if ((Intent.ACTION_VIEW.equals(intent.getAction())&&(VIEW_CONVERSATION.equals(intent.getType())))) {
 			String convToView = (String) intent.getExtras().get(
 					CONVERSATION);
-
+			updateConversationList();
 			for (int i = 0; i < conversationList.size(); ++i) {
 				if (conversationList.get(i).getUuid().equals(convToView)) {
 					setSelectedConversation(conversationList.get(i));
+					break;
 				}
 			}
 			paneShouldBeOpen = false;