diff --git a/src/lib/component/controller/SearchController.cpp b/src/lib/component/controller/SearchController.cpp
index 290cd2d4..3fa45e7d 100644
--- a/src/lib/component/controller/SearchController.cpp
+++ b/src/lib/component/controller/SearchController.cpp
@@ -14,7 +14,7 @@ SearchController::~SearchController()
 
 void SearchController::handleMessage(MessageActivateTokens* message)
 {
-	if (!message->keepContent())
+	if (!message->keepContent() && !message->isFromSearch)
 	{
 		getView()->setMatches(m_storageAccess->getSearchMatchesForTokenIds(message->tokenIds));
 	}
diff --git a/src/lib/component/controller/helper/ActivationTranslator.cpp b/src/lib/component/controller/helper/ActivationTranslator.cpp
index c2215d56..703ef9bc 100644
--- a/src/lib/component/controller/helper/ActivationTranslator.cpp
+++ b/src/lib/component/controller/helper/ActivationTranslator.cpp
@@ -96,5 +96,6 @@ std::shared_ptr<MessageActivateTokens> ActivationTranslator::translateMessage(co
 	m = std::make_shared<MessageActivateTokens>(tokenIds);
 	m->undoRedoType = message->undoRedoType;
 	m->setKeepContent(message->keepContent());
+	m->isFromSearch = true;
 	return m;
 }
diff --git a/src/lib/utility/messaging/type/MessageActivateTokens.h b/src/lib/utility/messaging/type/MessageActivateTokens.h
index 04d7b641..6932008b 100644
--- a/src/lib/utility/messaging/type/MessageActivateTokens.h
+++ b/src/lib/utility/messaging/type/MessageActivateTokens.h
@@ -13,6 +13,7 @@ public:
 		, isEdge(false)
 		, isAggregation(false)
 		, isFromSystem(false)
+		, isFromSearch(false)
 	{
 	}
 
@@ -26,6 +27,7 @@ public:
 	bool isEdge;
 	bool isAggregation;
 	bool isFromSystem;
+	bool isFromSearch;
 };
 
 #endif // MESSAGE_ACTIVATE_TOKENS_H