diff --git a/kcm/package/contents/ui/OutputPanel.qml b/kcm/package/contents/ui/OutputPanel.qml
--- a/kcm/package/contents/ui/OutputPanel.qml
+++ b/kcm/package/contents/ui/OutputPanel.qml
@@ -25,14 +25,6 @@
     id: outputPanel
     property var element: model
 
-    Kirigami.Heading {
-        Layout.fillWidth: true
-        horizontalAlignment: Text.AlignHCenter
-        level: 2
-        text: i18n("Settings for %1", element.display)
-        visible: kcm.outputModel.rowCount() > 1
-    }
-
     Kirigami.FormLayout {
         twinFormLayouts: globalSettingsLayout
 
diff --git a/kcm/package/contents/ui/Panel.qml b/kcm/package/contents/ui/Panel.qml
--- a/kcm/package/contents/ui/Panel.qml
+++ b/kcm/package/contents/ui/Panel.qml
@@ -22,6 +22,31 @@
 import org.kde.private.kcm.kscreen 1.0 as KScreen
 
 ColumnLayout {
+    RowLayout {
+        Layout.alignment: Qt.AlignHCenter
+        spacing: 0
+        visible: kcm.outputModel.rowCount() > 1
+
+        Kirigami.Heading {
+            horizontalAlignment: Text.AlignHCenter
+            level: 2
+            // FIXME i18n change text in master
+            text: i18n("Settings for %1", " ")
+        }
+
+        Controls.ComboBox {
+            model: kcm.outputModel
+            textRole: "display"
+            currentIndex: root.selectedOutput
+            onActivated: {
+                root.selectedOutput = index
+                currentIndex = Qt.binding(function() {
+                    return root.selectedOutput;
+                });
+            }
+        }
+    }
+
     Controls.SwipeView {
         id: panelView
         currentIndex: root.selectedOutput
@@ -44,7 +69,7 @@
         visible: count > 1
 
         count: panelView.count
-        currentIndex: panelView.currentIndex
+        currentIndex: root.selectedOutput
         interactive: true
         onCurrentIndexChanged: root.selectedOutput = currentIndex
     }