diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 9732b68b86b76..d3eba1acf3bcf 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -412,8 +412,10 @@ Application::Application(int &argc, char **argv)
     connect(&_singleApp, &KDSingleApplication::messageReceived, this, &Application::slotParseMessage);
 #endif
 
+    // create accounts and folders from a legacy desktop client or from the current config file
+    setupAccountsAndFolders();
+
     if (AccountSetupCommandLineManager::instance()->isCommandLineParsed()) {
-        _folderManager.reset(new FolderMan);
         AccountSetupCommandLineManager::instance()->setupAccountFromCommandLine();
         _quitInstance = true;
     }
@@ -422,9 +424,6 @@ Application::Application(int &argc, char **argv)
         return;
     }
 
-    // create accounts and folders from a legacy desktop client or from the current config file
-    setupAccountsAndFolders();
-
     setQuitOnLastWindowClosed(false);
 
     // Setting up the gui class will allow tray notifications for the