diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
index 1079c84..8357933 100644
--- a/src/kiwixapp.cpp
+++ b/src/kiwixapp.cpp
@@ -105,6 +105,15 @@ void KiwixApp::init()
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, [=](QString monitorDir) {
         m_library.asyncUpdateFromDir(monitorDir);
     });
+
+    setupDirectoryMonitoring();
+
+    restoreTabs();
+    restoreWindowState();
+}
+
+void KiwixApp::setupDirectoryMonitoring()
+{
     QString monitorDir = m_settingsManager.getMonitorDir();
     QString downloadDir = m_settingsManager.getDownloadDir();
     auto dirList = QSet<QString>({monitorDir, downloadDir});
@@ -115,9 +124,6 @@ void KiwixApp::init()
             m_library.asyncUpdateFromDir(dir);
         }
     }
-
-    restoreTabs();
-    restoreWindowState();
 }
 
 KiwixApp::~KiwixApp()
diff --git a/src/kiwixapp.h b/src/kiwixapp.h
index ae5342d..898d2f3 100644
--- a/src/kiwixapp.h
+++ b/src/kiwixapp.h
@@ -123,6 +123,7 @@ private:
 
     QAction*     mpa_actions[MAX_ACTION];
 
+    void setupDirectoryMonitoring();
     QString findLibraryDirectory();
     void restoreTabs();
     void loadAndInstallTranslations(QTranslator& translator, const QString& filename, const QString& directory);