diff --git a/src/base/scanfoldersmodel.cpp b/src/base/scanfoldersmodel.cpp
index d2844506a..9960e2f92 100644
--- a/src/base/scanfoldersmodel.cpp
+++ b/src/base/scanfoldersmodel.cpp
@@ -128,10 +128,8 @@ QVariant ScanFoldersModel::data(const QModelIndex &index, int role) const
         else if (role == Qt::DisplayRole) {
             switch (pathData->downloadType) {
             case DOWNLOAD_IN_WATCH_FOLDER:
-                value = tr("Watch Folder");
-                break;
             case DEFAULT_LOCATION:
-                value = tr("Default Folder");
+                value = pathTypeDisplayName(pathData->downloadType);
                 break;
             case CUSTOM_LOCATION:
                 value = pathData->downloadPath;
@@ -392,3 +390,18 @@ void ScanFoldersModel::addTorrentsToSession(const QStringList &pathList)
         }
     }
 }
+
+QString ScanFoldersModel::pathTypeDisplayName(const PathType type)
+{
+    switch(type) {
+    case DOWNLOAD_IN_WATCH_FOLDER:
+        return tr("Monitored folder");
+    case DEFAULT_LOCATION:
+        return tr("Default save location");
+    case CUSTOM_LOCATION:
+        return tr("Browse...");
+    default:
+        qDebug("Invalid PathType: %d", type);
+    };
+    return QString();
+}
diff --git a/src/base/scanfoldersmodel.h b/src/base/scanfoldersmodel.h
index 25dfdfd22..24bd05549 100644
--- a/src/base/scanfoldersmodel.h
+++ b/src/base/scanfoldersmodel.h
@@ -73,6 +73,8 @@ public:
     static void freeInstance();
     static ScanFoldersModel *instance();
 
+    static QString pathTypeDisplayName(const PathType type);
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
diff --git a/src/gui/scanfoldersdelegate.cpp b/src/gui/scanfoldersdelegate.cpp
index 5ad14f641..56fa993fc 100644
--- a/src/gui/scanfoldersdelegate.cpp
+++ b/src/gui/scanfoldersdelegate.cpp
@@ -63,9 +63,9 @@ QWidget *ScanFoldersDelegate::createEditor(QWidget *parent, const QStyleOptionVi
     QComboBox* editor = new QComboBox(parent);
 
     editor->setFocusPolicy(Qt::StrongFocus);
-    editor->addItem(tr("Same as monitored folder"));
-    editor->addItem(tr("Default save location"));
-    editor->addItem(tr("Browse..."));
+    editor->addItem(ScanFoldersModel::pathTypeDisplayName(ScanFoldersModel::DOWNLOAD_IN_WATCH_FOLDER));
+    editor->addItem(ScanFoldersModel::pathTypeDisplayName(ScanFoldersModel::DEFAULT_LOCATION));
+    editor->addItem(ScanFoldersModel::pathTypeDisplayName(ScanFoldersModel::CUSTOM_LOCATION));
     if (index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION) {
         editor->insertSeparator(3);
         editor->addItem(index.data().toString());