diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index 72246acf..bdec80b2 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -219,6 +219,14 @@ void CodeController::handleMessage(MessageChangeFileView* message)
 	showContents(message);
 }
 
+void CodeController::handleMessage(MessageClearErrorCount* message)
+{
+	if (getView()->showsErrors())
+	{
+		clear();
+	}
+}
+
 void CodeController::handleMessage(MessageFlushUpdates* message)
 {
 	showContents(message);
diff --git a/src/lib/component/controller/CodeController.h b/src/lib/component/controller/CodeController.h
index b6c9f1d6..d6299e06 100644
--- a/src/lib/component/controller/CodeController.h
+++ b/src/lib/component/controller/CodeController.h
@@ -9,6 +9,7 @@
 #include "utility/messaging/type/MessageActivateLocalSymbols.h"
 #include "utility/messaging/type/MessageActivateTokens.h"
 #include "utility/messaging/type/MessageChangeFileView.h"
+#include "utility/messaging/type/MessageClearErrorCount.h"
 #include "utility/messaging/type/MessageFlushUpdates.h"
 #include "utility/messaging/type/MessageFocusIn.h"
 #include "utility/messaging/type/MessageFocusOut.h"
@@ -34,6 +35,7 @@ class CodeController
 	, public MessageListener<MessageActivateLocalSymbols>
 	, public MessageListener<MessageActivateTokens>
 	, public MessageListener<MessageChangeFileView>
+	, public MessageListener<MessageClearErrorCount>
 	, public MessageListener<MessageFlushUpdates>
 	, public MessageListener<MessageFocusIn>
 	, public MessageListener<MessageFocusOut>
@@ -54,6 +56,7 @@ private:
 	virtual void handleMessage(MessageActivateLocalSymbols* message);
 	virtual void handleMessage(MessageActivateTokens* message);
 	virtual void handleMessage(MessageChangeFileView* message);
+	virtual void handleMessage(MessageClearErrorCount* message);
 	virtual void handleMessage(MessageFlushUpdates* message);
 	virtual void handleMessage(MessageFocusIn* message);
 	virtual void handleMessage(MessageFocusOut* message);