diff --git a/src/lib/settings/SourceGroupSettingsCxxCdb.cpp b/src/lib/settings/SourceGroupSettingsCxxCdb.cpp
index dea2f967..a6cc2638 100644
--- a/src/lib/settings/SourceGroupSettingsCxxCdb.cpp
+++ b/src/lib/settings/SourceGroupSettingsCxxCdb.cpp
@@ -40,7 +40,8 @@ bool SourceGroupSettingsCxxCdb::equals(std::shared_ptr<SourceGroupSettings> othe
 	return (
 		otherCxxCdb &&
 		SourceGroupSettingsCxx::equals(other) &&
-		m_compilationDatabasePath == otherCxxCdb->m_compilationDatabasePath
+		m_compilationDatabasePath == otherCxxCdb->m_compilationDatabasePath &&
+		utility::isPermutation(m_indexedHeaderPaths, otherCxxCdb->m_indexedHeaderPaths)
 	);
 }
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
index 2298141a..8a44ec13 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
@@ -334,11 +334,6 @@ void QtProjectWizzardContentPathsCDBHeader::load()
 {
 	if (std::shared_ptr<SourceGroupSettingsCxxCdb> cdbSettings = std::dynamic_pointer_cast<SourceGroupSettingsCxxCdb>(m_settings))
 	{
-		if (cdbSettings->getIndexedHeaderPaths().empty())
-		{
-			cdbSettings->setIndexedHeaderPaths(getIndexedPathsDerivedFromCDB(cdbSettings));
-		}
-
 		m_list->setPaths(cdbSettings->getIndexedHeaderPaths());
 	}
 }