diff --git a/utils/themeeditor/main.cpp b/utils/themeeditor/main.cpp
index ad4ae6ffae..78df1878f6 100644
--- a/utils/themeeditor/main.cpp
+++ b/utils/themeeditor/main.cpp
@@ -35,9 +35,9 @@ int main(int argc, char* argv[])
 {
     QApplication app(argc, argv);
 
-    QCoreApplication::setApplicationName(QObject::tr("Rockbox Theme Editor"));
-    QCoreApplication::setApplicationVersion(QObject::tr("Pre-Alpha"));
-    QCoreApplication::setOrganizationName(QObject::tr("Rockbox"));
+    QCoreApplication::setApplicationName("Rockbox Theme Editor");
+    QCoreApplication::setApplicationVersion("Pre-Alpha");
+    QCoreApplication::setOrganizationName("rockbox.org");
 
     EditorWindow mainWindow;
     mainWindow.show();
diff --git a/utils/themeeditor/preferencesdialog.cpp b/utils/themeeditor/preferencesdialog.cpp
index 9b28b275f8..78f2ed7206 100644
--- a/utils/themeeditor/preferencesdialog.cpp
+++ b/utils/themeeditor/preferencesdialog.cpp
@@ -92,7 +92,10 @@ void PreferencesDialog::loadFont()
     QSettings settings;
     settings.beginGroup("SkinDocument");
 
-    QVariant family = settings.value("fontFamily", QFont());
+    QFont def("Monospace");
+    def.setStyleHint(QFont::TypeWriter);
+
+    QVariant family = settings.value("fontFamily", def);
     int size = settings.value("fontSize", 12).toInt();
 
     settings.endGroup();
diff --git a/utils/themeeditor/preferencesdialog.ui b/utils/themeeditor/preferencesdialog.ui
index af10875721..3d4a60142f 100644
--- a/utils/themeeditor/preferencesdialog.ui
+++ b/utils/themeeditor/preferencesdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="prefsGroups">
      <property name="tabPosition">
-      <enum>QTabWidget::West</enum>
+      <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
       <number>0</number>
@@ -120,6 +120,9 @@
            <property name="text">
             <string>Error Color</string>
            </property>
+           <property name="buddy">
+            <cstring>errorButton</cstring>
+           </property>
           </widget>
          </item>
          <item>
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
index aa8fc500d3..3da248a30b 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/skindocument.cpp
@@ -151,7 +151,9 @@ void SkinDocument::settingsChanged()
     errorColor.setProperty(QTextFormat::FullWidthSelection, true);
 
     /* Setting the font */
-    QFont family = settings.value("fontFamily", QFont()).value<QFont>();
+    QFont def("Monospace");
+    def.setStyleHint(QFont::TypeWriter);
+    QFont family = settings.value("fontFamily", def).value<QFont>();
     family.setPointSize(settings.value("fontSize", 12).toInt());
     editor->setFont(family);