Index: programs/mythfrontend/globalsettings.cpp
===================================================================
--- programs/mythfrontend/globalsettings.cpp.orig	2009-01-13 14:44:08.000000000 -0500
+++ programs/mythfrontend/globalsettings.cpp	2009-01-13 16:13:28.000000000 -0500
@@ -2985,7 +2985,8 @@
 
     void fillSelections(void) {
         clearSelections();
-        addSelection(QObject::tr("Desktop Style"), "");
+        addSelection(QObject::tr("Desktop Style"),
+                     "UseSystemDefaultDesktopStyle");
         QStyleFactory factory;
         QStringList list = factory.keys();
         QStringList::iterator iter = list.begin();
Index: libs/libmythui/mythuihelper.cpp
===================================================================
--- libs/libmythui/mythuihelper.cpp.orig	2009-01-13 14:44:07.000000000 -0500
+++ libs/libmythui/mythuihelper.cpp	2009-01-13 16:13:28.000000000 -0500
@@ -10,6 +10,7 @@
 #include <QApplication>
 #include <QPainter>
 #include <QDesktopWidget>
+#include <QStyleFactory>
 
 #include "mythdirs.h"
 #include "mythuihelper.h"
@@ -389,8 +390,9 @@
 
     d->m_qtThemeSettings = new Settings;
 
-    QString style = GetMythDB()->GetSetting("Style", "");
-    if (!style.isEmpty())
+    QString style = GetMythDB()->GetSetting("Style",
+                                            "UseSystemDefaultDesktopStyle");
+    if (QStyleFactory::keys().contains(style))
         qApp->setStyle(style);
 
     QString themename = GetMythDB()->GetSetting("Theme");