diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index c212a6c1fc..df72d5005b 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -73,7 +73,13 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
         }
     }
 
-    fonts.insert(0, new RBFont("Nothin'"));
+    fonts.insert(0, new RBFont("Default"));
+    QString defaultFont = settings->value("font", "");
+    if(defaultFont != "")
+    {
+        defaultFont.replace("/.rockbox", settings->value("themebase", ""));
+        fonts.insert(1, new RBFont(defaultFont));
+    }
 
     if(parent == 0)
     {