diff --git a/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml b/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
index b06c51c02..2d1e42680 100644
--- a/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
+++ b/applets/systemmonitor/common/contents/ui/ConfigGeneral.qml
@@ -164,8 +164,10 @@ Item {
                             }
                         } else {
                             var idx = cfg_sources.indexOf(model.source);
-                            if (idx !== -1) {
-                                cfg_sources.splice(idx, 1);
+                            if (cfg_sources.length !== 1) { // This condition prohibits turning off the last item from the list.
+                                if (idx !== -1) {
+                                    cfg_sources.splice(idx, 1);
+                                }
                             }
                         }
                         cfg_sourcesChanged();
diff --git a/lookandfeel/contents/components/SessionManagementScreen.qml b/lookandfeel/contents/components/SessionManagementScreen.qml
index 823705e73..5f8826048 100644
--- a/lookandfeel/contents/components/SessionManagementScreen.qml
+++ b/lookandfeel/contents/components/SessionManagementScreen.qml
@@ -25,7 +25,7 @@ import QtQuick.Controls 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-FocusScope {
+Item {
     id: root
 
     /*
diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
index cac457114..4501bb873 100644
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -233,7 +233,6 @@ PlasmaCore.ColorScope {
 
                 showUserList: userList.y + mainStack.y > 0
 
-                focus: true // Drop this and hack below when porting this stackview to QQC2
                 Stack.onStatusChanged: {
                     // prepare for presenting again to the user
                     if (Stack.status == Stack.Activating) {