diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp
index aea7e11c63..e6bbf627a4 100644
--- a/tabbox/tabbox.cpp
+++ b/tabbox/tabbox.cpp
@@ -761,8 +761,9 @@ void TabBox::reconfigure()
     m_delayShow = config.readEntry<bool>("ShowDelay", true);
     m_delayShowTime = config.readEntry<int>("DelayTime", 90);
 
-    m_desktopConfig.setLayoutName(config.readEntry("DesktopLayout", "informative"));
-    m_desktopListConfig.setLayoutName(config.readEntry("DesktopListLayout", "informative"));
+    const QString defaultDesktopLayout = QStringLiteral("org.kde.breeze.desktop");
+    m_desktopConfig.setLayoutName(config.readEntry("DesktopLayout", defaultDesktopLayout));
+    m_desktopListConfig.setLayoutName(config.readEntry("DesktopListLayout", defaultDesktopLayout));
 
 #ifdef KWIN_BUILD_SCREENEDGES
     QList<ElectricBorder> *borders = &m_borderActivate;
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 44bed90f87..f2c8af21e2 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -232,10 +232,13 @@ void TabBoxHandlerPrivate::endHighlightWindows(bool abort)
 QObject *TabBoxHandlerPrivate::createSwitcherItem(bool desktopMode)
 {
     QString file;
-    if (!desktopMode) {
-        // first try look'n'feel package
+    // first try look'n'feel package
+    if (desktopMode) {
         file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                        QStringLiteral("plasma/look-and-feel/%1/contents/windowswitcher/WindowSwitcher.qml").arg(config.layoutName()));
+                                      QStringLiteral("plasma/look-and-feel/%1/contents/desktopswitcher/DesktopSwitcher.qml").arg(config.layoutName()));
+    } else {
+        file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                      QStringLiteral("plasma/look-and-feel/%1/contents/windowswitcher/WindowSwitcher.qml").arg(config.layoutName()));
     }
     if (file.isNull()) {
         auto findSwitcher = [this, desktopMode] {