diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 1917490f0f..5e3517af23 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -319,7 +319,7 @@ int main(int argc, char **argv)
     options.trustSSL = false;
     options.useNetrc = false;
     options.interactive = true;
-    options.ignoreHiddenFiles = true;
+    options.ignoreHiddenFiles = false; // Default is to sync hidden files
     options.nonShib = false;
     options.restartTimes = 3;
     options.uplimit = 0;
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index a47af797cb..5eccf217b9 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -680,7 +680,7 @@ void AccountSettings::slotFolderWizardAccepted()
 
     /* take the value from the definition of already existing folders. All folders have
      * the same setting so far.
-     * The default is to not sync hidden files
+     * The default is to sync hidden files
      */
     definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles();
 
diff --git a/src/gui/folder.h b/src/gui/folder.h
index eaf0e4994b..9243c291e0 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -49,7 +49,7 @@ class FolderDefinition
 public:
     FolderDefinition()
         : paused(false)
-        , ignoreHiddenFiles(true)
+        , ignoreHiddenFiles(false)
     {
     }
 
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 0a820320e1..53bb6e5c4b 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1372,8 +1372,10 @@ QString FolderMan::findGoodPathForNewSyncFolder(const QString &basePath, const Q
 bool FolderMan::ignoreHiddenFiles() const
 {
     if (_folderMap.empty()) {
-        return true;
+        // Currently no folders in the manager -> return default
+        return false;
     }
+    // Since the hiddenFiles settings is the same for all folders, just return the settings of the first folder
     return _folderMap.begin().value()->ignoreHiddenFiles();
 }