diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt
index 079df710..e1103410 100644
--- a/bin/test/data/log/test_log.txt
+++ b/bin/test/data/log/test_log.txt
@@ -1,4 +1,3 @@
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
 Edge.cpp ERROR: Nodes are not plain copies.
diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index ea52bb51..c43c808c 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -130,6 +130,11 @@ void CodeController::handleMessage(MessageActivateTokens* message)
 	else if (message->keepContent())
 	{
 		view->showActiveTokenIds(activeTokenIds);
+		if (m_scrollToDefinition)
+		{
+			getView()->scrollToDefinition(true);
+			m_scrollToDefinition = false;
+		}
 	}
 	else
 	{
@@ -262,7 +267,7 @@ void CodeController::handleMessage(MessageDeactivateEdge* message)
 {
 	if (message->scrollToDefinition)
 	{
-		getView()->scrollToDefinition(true);
+		m_scrollToDefinition = true;
 	}
 }