diff --git a/kcm/package/contents/ui/Orientation.qml b/kcm/package/contents/ui/Orientation.qml
new file mode 100644
--- /dev/null
+++ b/kcm/package/contents/ui/Orientation.qml
@@ -0,0 +1,42 @@
+/********************************************************************
+Copyright © 2019 Roman Gilg <subdiff@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+import QtQuick 2.9
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.3 as Controls
+import org.kde.kirigami 2.4 as Kirigami
+
+RowLayout {
+   id: orientation
+   Kirigami.FormData.label: i18n("Orientation:")
+
+   Controls.ButtonGroup {
+       buttons: orientation.children
+   }
+
+   RotationButton {
+       value: 0
+   }
+   RotationButton {
+       value: 90
+   }
+   RotationButton {
+       value: 180
+   }
+   RotationButton {
+       value: 270
+   }
+}
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
@@ -92,27 +92,7 @@
             }
         }
 
-        Controls.ButtonGroup {
-            buttons: orientation.children
-        }
-
-        RowLayout {
-           id: orientation
-           Kirigami.FormData.label: i18n("Orientation:")
-
-           RotationButton {
-               value: 0
-           }
-           RotationButton {
-               value: 90
-           }
-           RotationButton {
-               value: 180
-           }
-           RotationButton {
-               value: 270
-           }
-        }
+        Orientation {}
 
         Controls.ComboBox {
             Kirigami.FormData.label: i18n("Refresh rate:")