diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index ddb406d6e..46ddb9cd6 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -152,7 +152,13 @@ class MessageUserStore
 				selectedMessage = this.selectorMessageSelected(),
 				focusedMessage = this.selectorMessageFocused();
 
-			return _.union(checked, selectedMessage ? [selectedMessage] : [], focusedMessage ? [focusedMessage] : []);
+			if (checked.length) {
+				return _.union(checked, selectedMessage ? [selectedMessage] : []);
+			} else if (selectedMessage) {
+				return [selectedMessage];
+			} else {
+				return focusedMessage ? [focusedMessage] : [];
+			}
 		});
 
 		this.messageListCheckedOrSelectedUidsWithSubMails = ko.computed(() => {