diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 985d5e08c..734ccb80e 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -553,6 +553,8 @@ void ConfigManager::loadConfigFile( const QString & configFile )
 	}
 #endif
 
+	upgrade();
+
 	QStringList searchPaths;
 	if(! qgetenv("LMMS_THEME_PATH").isNull())
 		searchPaths << qgetenv("LMMS_THEME_PATH");
@@ -564,8 +566,6 @@ void ConfigManager::loadConfigFile( const QString & configFile )
 	{
 		createWorkingDir();
 	}
-
-	upgrade();
 }