diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 3df758137..696a048a9 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -140,9 +140,9 @@ Bittorrent::Bittorrent()
 #ifdef LIBTORRENT_0_15
   appendqBExtension = Preferences::useIncompleteFilesExtension();
 #endif
+  connect(m_scanFolders, SIGNAL(torrentsAdded(QStringList&)), this, SLOT(addTorrentsFromScanFolder(QStringList&)));
   // Apply user settings to Bittorrent session
   configureSession();
-  connect(m_scanFolders, SIGNAL(torrentsAdded(QStringList&)), this, SLOT(addTorrentsFromScanFolder(QStringList&)));
   qDebug("* BTSession constructed");
 }
 
diff --git a/src/filesystemwatcher.h b/src/filesystemwatcher.h
index 21e004b45..217777d65 100644
--- a/src/filesystemwatcher.h
+++ b/src/filesystemwatcher.h
@@ -103,12 +103,6 @@ public:
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
-  FileSystemWatcher(QString path, QObject *parent): QFileSystemWatcher(parent) {
-    filters << "*.torrent";
-    connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
-    addPath(path);
-  }
-
   ~FileSystemWatcher() {
 #ifndef Q_WS_WIN
     if(watch_timer)