diff --git a/src/QGCCore.cc b/src/QGCCore.cc
index 9a100c69fd567742c54ba2b53c1e50dfa76451e1..9a24a962abc14528aaf6ed5c302a045ea1f970da 100644
--- a/src/QGCCore.cc
+++ b/src/QGCCore.cc
@@ -155,9 +155,10 @@ bool QGCApplication::init(void)
         QDir documentsDir(documentsLocation);
         Q_ASSERT(documentsDir.exists());
         
-        if (documentsDir.mkpath(_defaultSavedFileDirectoryName)) {
-            savedFilesLocation = documentsDir.filePath(_defaultSavedFileDirectoryName);
-        }
+        bool pathCreated = documentsDir.mkpath(_defaultSavedFileDirectoryName);
+        Q_ASSERT(pathCreated);
+        savedFilesLocation = documentsDir.filePath(_defaultSavedFileDirectoryName);
+        settings.setValue(_savedFilesLocationKey, savedFilesLocation);
     }
     
     if (!savedFilesLocation.isEmpty()) {