diff --git a/src/lib/component/controller/ScreenSearchController.cpp b/src/lib/component/controller/ScreenSearchController.cpp
index c43994d5..1b24c194 100644
--- a/src/lib/component/controller/ScreenSearchController.cpp
+++ b/src/lib/component/controller/ScreenSearchController.cpp
@@ -147,3 +147,73 @@ size_t ScreenSearchController::getResponderId(ScreenSearchResponder* responder)
 
 	return 0;
 }
+
+void ScreenSearchController::handleMessage(MessageActivateAll* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateErrors* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateFullTextSearch* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateLegend* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateLocalSymbols* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateTokens* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateTrail* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageActivateTrailEdge* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageChangeFileView* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageCodeShowDefinition* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageDeactivateEdge* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageGraphNodeBundleSplit* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageGraphNodeExpand* message)
+{
+	clearMatches();
+}
+
+void ScreenSearchController::handleMessage(MessageGraphNodeHide* message)
+{
+	clearMatches();
+}
diff --git a/src/lib/component/controller/ScreenSearchController.h b/src/lib/component/controller/ScreenSearchController.h
index 5bd78df2..25adce5d 100644
--- a/src/lib/component/controller/ScreenSearchController.h
+++ b/src/lib/component/controller/ScreenSearchController.h
@@ -5,12 +5,40 @@
 #include <set>
 
 #include "Controller.h"
-#include "ScreenSearchInterfaces.h"
+#include "MessageActivateAll.h"
+#include "MessageActivateErrors.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageActivateLegend.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageActivateTokens.h"
+#include "MessageActivateTrail.h"
+#include "MessageActivateTrailEdge.h"
+#include "MessageChangeFileView.h"
+#include "MessageCodeShowDefinition.h"
+#include "MessageDeactivateEdge.h"
+#include "MessageGraphNodeBundleSplit.h"
+#include "MessageGraphNodeExpand.h"
+#include "MessageGraphNodeHide.h"
 #include "MessageListener.h"
+#include "ScreenSearchInterfaces.h"
 
 class ScreenSearchController
 	: public Controller
 	, public ScreenSearchSender
+	, public MessageListener<MessageActivateAll>
+	, public MessageListener<MessageActivateErrors>
+	, public MessageListener<MessageActivateFullTextSearch>
+	, public MessageListener<MessageActivateLegend>
+	, public MessageListener<MessageActivateLocalSymbols>
+	, public MessageListener<MessageActivateTokens>
+	, public MessageListener<MessageActivateTrail>
+	, public MessageListener<MessageActivateTrailEdge>
+	, public MessageListener<MessageChangeFileView>
+	, public MessageListener<MessageCodeShowDefinition>
+	, public MessageListener<MessageDeactivateEdge>
+	, public MessageListener<MessageGraphNodeBundleSplit>
+	, public MessageListener<MessageGraphNodeExpand>
+	, public MessageListener<MessageGraphNodeHide>
 {
 public:
 	virtual ~ScreenSearchController() = default;
@@ -30,6 +58,21 @@ public:
 private:
 	size_t getResponderId(ScreenSearchResponder* responder) const;
 
+	void handleMessage(MessageActivateAll* message) override;
+	void handleMessage(MessageActivateErrors* message) override;
+	void handleMessage(MessageActivateFullTextSearch* message) override;
+	void handleMessage(MessageActivateLegend* message) override;
+	void handleMessage(MessageActivateLocalSymbols* message) override;
+	void handleMessage(MessageActivateTokens* message) override;
+	void handleMessage(MessageActivateTrail* message) override;
+	void handleMessage(MessageActivateTrailEdge* message) override;
+	void handleMessage(MessageChangeFileView* message) override;
+	void handleMessage(MessageCodeShowDefinition* message) override;
+	void handleMessage(MessageDeactivateEdge* message) override;
+	void handleMessage(MessageGraphNodeBundleSplit* message) override;
+	void handleMessage(MessageGraphNodeExpand* message) override;
+	void handleMessage(MessageGraphNodeHide* message) override;
+
 	std::vector<ScreenSearchResponder*> m_responders;
 
 	std::vector<std::pair<size_t, size_t>> m_matches;
diff --git a/src/lib/component/controller/UndoRedoController.h b/src/lib/component/controller/UndoRedoController.h
index 19ba3d79..172e8f32 100644
--- a/src/lib/component/controller/UndoRedoController.h
+++ b/src/lib/component/controller/UndoRedoController.h
@@ -5,29 +5,29 @@
 
 #include "MessageBase.h"
 #include "MessageListener.h"
-#include "MessageActivateLegend.h"
-#include "MessageCodeShowDefinition.h"
-#include "MessageActivateErrors.h"
-#include "MessageShowError.h"
-#include "MessageHistoryRedo.h"
-#include "MessageHistoryToPosition.h"
-#include "MessageHistoryUndo.h"
-#include "MessageIndexingFinished.h"
 #include "MessageActivateAll.h"
+#include "MessageActivateErrors.h"
 #include "MessageActivateFullTextSearch.h"
+#include "MessageActivateLegend.h"
 #include "MessageActivateLocalSymbols.h"
 #include "MessageActivateTokens.h"
 #include "MessageActivateTrail.h"
 #include "MessageActivateTrailEdge.h"
 #include "MessageChangeFileView.h"
+#include "MessageCodeShowDefinition.h"
 #include "MessageDeactivateEdge.h"
 #include "MessageGraphNodeBundleSplit.h"
 #include "MessageGraphNodeExpand.h"
 #include "MessageGraphNodeHide.h"
 #include "MessageGraphNodeMove.h"
+#include "MessageHistoryRedo.h"
+#include "MessageHistoryToPosition.h"
+#include "MessageHistoryUndo.h"
+#include "MessageIndexingFinished.h"
 #include "MessageRefreshUI.h"
 #include "MessageScrollCode.h"
 #include "MessageScrollGraph.h"
+#include "MessageShowError.h"
 #include "MessageShowReference.h"
 #include "MessageShowScope.h"