diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index d3765df18..3cddbffbe 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -575,7 +575,7 @@ void options_imp::loadOptions(){
   checkPreallocateAll->setChecked(Preferences::preAllocateAllFiles());
   checkAdditionDialog->setChecked(Preferences::useAdditionDialog());
   checkStartPaused->setChecked(Preferences::addTorrentsInPause());
-  strValue = Preferences::getSavePath();
+  strValue = Preferences::getScanDir();
   if(strValue.isEmpty()) {
     // Disable
     checkScanDir->setChecked(false);
@@ -1275,9 +1275,7 @@ void options_imp::setLocale(QString locale){
 // Return scan dir set in options
 QString options_imp::getScanDir() const {
   if(checkScanDir->isChecked()){
-    QString scanDir = textScanDir->text();
-    scanDir = scanDir.trimmed();
-    return scanDir;
+    return textScanDir->text().trimmed();
   }else{
     return QString();
   }
diff --git a/src/preferences.h b/src/preferences.h
index b282ebda2..25d834782 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -148,7 +148,7 @@ public:
 
   static bool isDirScanEnabled() {
     QSettings settings("qBittorrent", "qBittorrent");
-    return settings.value(QString::fromUtf8("Preferences/Downloads/ScanDir"), QString()).toString().isEmpty();
+    return !settings.value(QString::fromUtf8("Preferences/Downloads/ScanDir"), QString()).toString().isEmpty();
   }
 
   static QString getScanDir() {