diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 8ba8bdaa2b2b2cad0b152ac7961dcf8d32bccecd..bcc43159e4d60e2b4565cd575ff8ce6609eeebcc 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -390,7 +390,8 @@ public class StartConversationActivity extends XmppActivity
         } else if(intent.hasExtra(EXTRA_ACCOUNT_FILTER)) {
             pendingViewIntent.push(intent);
             setIntent(intent);
-        } else if (isViewIntent(intent)) {
+        }
+        if (isViewIntent(intent) && pendingViewIntent.peek() == null) {
             pendingViewIntent.push(intent);
             createdByViewIntent = true;
             setIntent(createLauncherIntent(this));