diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
index 11336fae9..f163009e2 100644
--- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
@@ -1,138 +1,138 @@
 /*
  *   Copyright 2011 Viranch Mehta <viranch.mehta@gmail.com>
  *   Copyright 2013-2016 Kai Uwe Broulik <kde@privat.broulik.de>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2 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 Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as Components
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kquickcontrolsaddons 2.0
 
 FocusScope {
     id: dialog
     focus: true
 
     property alias model: batteryList.model
     property bool pluggedIn
 
     property int remainingTime
 
     property bool isBrightnessAvailable
     property bool isKeyboardBrightnessAvailable
 
     signal powermanagementChanged(bool checked)
 
     Component.onCompleted: {
         // setup handler on slider value manually to avoid change on creation
 
         brightnessSlider.valueChanged.connect(function() {
             batterymonitor.screenBrightness = brightnessSlider.value
         })
 
         keyboardBrightnessSlider.valueChanged.connect(function() {
             batterymonitor.keyboardBrightness = keyboardBrightnessSlider.value
         })
     }
 
     Column {
         id: settingsColumn
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width - units.gridUnit
         spacing: Math.round(units.gridUnit / 2)
 
         Components.Label {
             // this is just for metrics, TODO use TextMetrics in 5.4 instead
             id: percentageMeasurementLabel
             text: i18nc("Used for measurement", "100%")
             visible: false
         }
 
+        PowerManagementItem {
+            id: pmSwitch
+            width: parent.width
+            onEnabledChanged: powermanagementChanged(enabled)
+            KeyNavigation.tab: batteryList
+            KeyNavigation.backtab: keyboardBrightnessSlider
+        }
+
         BrightnessItem {
             id: brightnessSlider
             width: parent.width
 
             icon: "video-display-brightness"
             label: i18n("Display Brightness")
             visible: isBrightnessAvailable
             value: batterymonitor.screenBrightness
             maximumValue: batterymonitor.maximumScreenBrightness
             KeyNavigation.tab: keyboardBrightnessSlider
             KeyNavigation.backtab: batteryList
 
             // Manually dragging the slider around breaks the binding
             Connections {
                 target: batterymonitor
                 onScreenBrightnessChanged: brightnessSlider.value = batterymonitor.screenBrightness
             }
         }
 
         BrightnessItem {
             id: keyboardBrightnessSlider
             width: parent.width
 
             icon: "input-keyboard-brightness"
             label: i18n("Keyboard Brightness")
             value: batterymonitor.keyboardBrightness
             maximumValue: batterymonitor.maximumKeyboardBrightness
             visible: isKeyboardBrightnessAvailable
             KeyNavigation.tab: pmSwitch
             KeyNavigation.backtab: brightnessSlider
 
             // Manually dragging the slider around breaks the binding
             Connections {
                 target: batterymonitor
                 onKeyboardBrightnessChanged: keyboardBrightnessSlider.value = batterymonitor.keyboardBrightness
             }
         }
-
-        PowerManagementItem {
-            id: pmSwitch
-            width: parent.width
-            onEnabledChanged: powermanagementChanged(enabled)
-            KeyNavigation.tab: batteryList
-            KeyNavigation.backtab: keyboardBrightnessSlider
-        }
     }
 
     PlasmaExtras.ScrollArea {
         anchors {
             horizontalCenter: parent.horizontalCenter
             top: settingsColumn.bottom
             topMargin: units.gridUnit // not divided by 2 for unified looks
             bottom: dialog.bottom
         }
         width: parent.width - units.gridUnit
 
         ListView {
             id: batteryList
 
             boundsBehavior: Flickable.StopAtBounds
             spacing: Math.round(units.gridUnit / 2)
 
             KeyNavigation.tab: brightnessSlider
             KeyNavigation.backtab: pmSwitch
 
             delegate: BatteryItem {
                 width: parent.width
                 battery: model
             }
         }
     }
 
 }