2 files changed, 8 insertions, 2 deletions

diff --git a/utils/themeeditor/gui/fontdownloader.cpp b/utils/themeeditor/gui/fontdownloader.cpp
index 7aa4cd8d57..693f4a5b20 100644
--- a/utils/themeeditor/gui/fontdownloader.cpp
+++ b/utils/themeeditor/gui/fontdownloader.cpp
@@ -40,6 +40,9 @@ FontDownloader::FontDownloader(QWidget *parent, QString path) :
 
     manager = new QNetworkAccessManager();
 
+    if(!dir.exists())
+        dir.mkpath(path);
+
     if(dir.isReadable())
     {
         fout.setFileName(dir.absolutePath() + "/fonts.zip");
diff --git a/utils/themeeditor/gui/preferencesdialog.cpp b/utils/themeeditor/gui/preferencesdialog.cpp
index b8d0a0a6d6..d28b21345d 100644
--- a/utils/themeeditor/gui/preferencesdialog.cpp
+++ b/utils/themeeditor/gui/preferencesdialog.cpp
@@ -113,7 +113,10 @@ void PreferencesDialog::loadRender()
     QSettings settings;
     settings.beginGroup("RBFont");
 
-    ui->fontBox->setText(settings.value("fontDir", "/").toString());
+    QString confDir = QDir::homePath() + "/.rbthemeeditor";
+
+    ui->fontBox->setText(settings.value("fontDir", confDir + "/fonts/")
+                         .toString());
 
     settings.endGroup();
 
@@ -129,7 +132,7 @@ void PreferencesDialog::loadRender()
     settings.beginGroup("TargetData");
 
     ui->dbBox->setText(settings.value("targetDbPath",
-                                      QDir::homePath() + "/.targetdb")
+                                      confDir + "/targetdb")
                        .toString());
 
     settings.endGroup();