diff --git a/libssu/ssusettings.cpp b/libssu/ssusettings.cpp
index bab0ef3..14521a8 100644
--- a/libssu/ssusettings.cpp
+++ b/libssu/ssusettings.cpp
@@ -41,7 +41,7 @@ void SsuSettings::merge(){
 
   SsuLog *ssuLog = SsuLog::instance();
 
-  QDirIterator it(settingsd, QDirIterator::FollowSymlinks);
+  QDirIterator it(settingsd, QDir::AllEntries|QDir::NoDotAndDotDot, QDirIterator::FollowSymlinks);
   QStringList settingsFiles;
 
   QFileInfo oldSettingsInfo(fileName());
@@ -49,8 +49,6 @@ void SsuSettings::merge(){
   while (it.hasNext()){
     QString f = it.next();
 
-    if (it.fileName() == "." || it.fileName() == "..") continue;
-
     settingsFiles.append(it.filePath());
 
     QFileInfo info(it.filePath());
@@ -84,8 +82,8 @@ void SsuSettings::merge(){
 
       settings.endGroup();
       endGroup();
-      sync();
     }
+    sync();
   }
 }