diff --git a/src/lib_gui/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp
index eb0cdc7b..c4130f7c 100644
--- a/src/lib_gui/qt/element/QtCodeFile.cpp
+++ b/src/lib_gui/qt/element/QtCodeFile.cpp
@@ -146,7 +146,6 @@ QtCodeSnippet* QtCodeFile::insertCodeSnippet(const CodeSnippetParams& params)
 		}
 		else if (oldSnippet->getStartLineNumber() < start || oldSnippet->getEndLineNumber() > end) // overlaping
 		{
-			m_navigator->clearSnippetReferences();
 			newSnippet = QtCodeSnippet::merged(newSnippet, oldSnippet, m_navigator, this);
 		}
 		else if (oldSnippet->getStartLineNumber() >= start && oldSnippet->getEndLineNumber() <= end) // enclosing
@@ -157,6 +156,8 @@ QtCodeSnippet* QtCodeFile::insertCodeSnippet(const CodeSnippetParams& params)
 			newSnippet->getArea()->updateSourceLocations(oldSnippet->getArea()->getSourceLocationFile());
 		}
 
+		m_navigator->clearSnippetReferences();
+
 		oldSnippet->hide();
 		m_snippetLayout->removeWidget(oldSnippet);
 		oldSnippet->deleteLater();
diff --git a/src/lib_gui/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp
index 4f5c7b1d..ab388801 100644
--- a/src/lib_gui/qt/element/QtCodeSnippet.cpp
+++ b/src/lib_gui/qt/element/QtCodeSnippet.cpp
@@ -11,10 +11,10 @@
 #include "QtCodeFile.h"
 
 QtCodeSnippet* QtCodeSnippet::merged(
-	QtCodeSnippet* a, QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file)
+	const QtCodeSnippet* a, const QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file)
 {
-	QtCodeSnippet* first = a->getStartLineNumber() < b->getStartLineNumber() ? a : b;
-	QtCodeSnippet* second = a->getStartLineNumber() > b->getStartLineNumber() ? a : b;
+	const QtCodeSnippet* first = a->getStartLineNumber() < b->getStartLineNumber() ? a : b;
+	const QtCodeSnippet* second = a->getStartLineNumber() > b->getStartLineNumber() ? a : b;
 
 	SourceLocationFile* aFile = a->m_codeArea->getSourceLocationFile().get();
 	SourceLocationFile* bFile = b->m_codeArea->getSourceLocationFile().get();
diff --git a/src/lib_gui/qt/element/QtCodeSnippet.h b/src/lib_gui/qt/element/QtCodeSnippet.h
index 13233fd2..82462c63 100644
--- a/src/lib_gui/qt/element/QtCodeSnippet.h
+++ b/src/lib_gui/qt/element/QtCodeSnippet.h
@@ -24,7 +24,7 @@ class QtCodeSnippet
 
 public:
 	static QtCodeSnippet* merged(
-		QtCodeSnippet* a, QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file);
+		const QtCodeSnippet* a, const QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file);
 
 	QtCodeSnippet(const CodeSnippetParams& params, QtCodeNavigator* navigator, QtCodeFile* file);
 	virtual ~QtCodeSnippet();