diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index 14376a7e..88d16337 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -32,7 +32,6 @@ void CodeController::handleMessage(MessageActivateAll* message)
 	TRACE("code all");
 
 	saveOrRestoreViewMode(message);
-	clear();
 
 	Project* currentProject = Application::getInstance()->getCurrentProject().get();
 	if (!currentProject || message->acceptedNodeTypes != NodeTypeSet::all())
diff --git a/src/lib/utility/messaging/type/MessageChangeFileView.h b/src/lib/utility/messaging/type/MessageChangeFileView.h
index 4269e5d8..58c55e74 100644
--- a/src/lib/utility/messaging/type/MessageChangeFileView.h
+++ b/src/lib/utility/messaging/type/MessageChangeFileView.h
@@ -46,11 +46,13 @@ public:
 
 	virtual void print(std::ostream& os) const
 	{
+		os << filePath.str();
+
 		switch (state)
 		{
-		case FILE_MINIMIZED: os << "minimize"; break;
-		case FILE_SNIPPETS: os << "snippets"; break;
-		case FILE_MAXIMIZED: os << "maximize"; break;
+		case FILE_MINIMIZED: os << ", minimize"; break;
+		case FILE_SNIPPETS: os << ", snippets"; break;
+		case FILE_MAXIMIZED: os << ", maximize"; break;
 		}
 
 		switch (viewMode)
diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp
index bee0ec13..94410a94 100644
--- a/src/lib_gui/qt/element/QtCodeNavigator.cpp
+++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp
@@ -459,6 +459,10 @@ void QtCodeNavigator::showActiveSnippet(
 			m_list->requestFileContent(filePath);
 		}
 	}
+	else if (firstReference.tokenId)
+	{
+		m_single->requestFileContent(firstReference.filePath);
+	}
 
 	if (firstReference.tokenId)
 	{