diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 6799d80d3..f42ea06b4 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -181,11 +181,17 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 				if (contacts.size() == 1) {
 					openConversationForContact((Contact) contacts.get(0));
 					return true;
+				} else if (contacts.size() == 0 && conferences.size() == 1) {
+					openConversationsForBookmark((Bookmark) conferences.get(0));
+					return true;
 				}
 			} else {
 				if (conferences.size() == 1) {
 					openConversationsForBookmark((Bookmark) conferences.get(0));
 					return true;
+				} else if (conferences.size() == 0 && contacts.size() == 1) {
+					openConversationForContact((Contact) contacts.get(0));
+					return true;
 				}
 			}
 			SoftKeyboardUtils.hideSoftKeyboard(StartConversationActivity.this);