diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp
index f1b75fe87f..eaf0a95158 100644
--- a/common/settings/settings_manager.cpp
+++ b/common/settings/settings_manager.cpp
@@ -71,7 +71,10 @@ SETTINGS_MANAGER::SETTINGS_MANAGER( bool aHeadless ) :
     // Here to allow the Python API to access the built-in colors
     registerBuiltinColorSettings();
 
-    if( !wxFileExists( GetPathForSettingsFile( m_common_settings ) ) )
+    wxFileName commonSettings( GetPathForSettingsFile( m_common_settings ),
+                               m_common_settings->GetFullFilename() );
+
+    if( !wxFileExists( commonSettings.GetFullPath() ) )
         Save( m_common_settings );
 }