Index: programs/mythfrontend/globalsettings.cpp
===================================================================
--- programs/mythfrontend/globalsettings.cpp	(revision 17694)
+++ programs/mythfrontend/globalsettings.cpp	(working copy)
@@ -2919,7 +2919,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	(revision 17694)
+++ libs/libmythui/mythuihelper.cpp	(working copy)
@@ -11,6 +11,7 @@
 #include <QApplication>
 #include <QPainter>
 #include <QDesktopWidget>
+#include <QStyleFactory>
 
 #include "mythdirs.h"
 #include "mythuihelper.h"
@@ -370,8 +371,9 @@
 
     d->m_qtThemeSettings = new Settings;
 
-    QString style = GetMythDB()->GetSetting("Style", "");
-    if (style != "")
+    QString style = GetMythDB()->GetSetting("Style",
+                                            "UseSystemDefaultDesktopStyle");
+    if (QStyleFactory::keys().contains(style))
         qApp->setStyle(style);
 
     QString themename = GetMythDB()->GetSetting("Theme");