@@ -390,15 +390,6 @@ Item {
390390
391391 onEmergencyCall: startLockedApp("dialer-app")
392392
393− Timer {
394− // See powerConnection for why this is useful
395− id: showGreeterDelayed
396− interval: 1
397− onTriggered: {
398− greeter.forceShow();
399− }
400− }
401−
402393 Binding {
403394 target: ApplicationManager
404395 property: "suspended"
@@ -432,7 +423,7 @@ Item {
432423
433424 onStatusChanged: {
434425 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
435− !callManager.hasCalls && !tutorial.running && shellMode != "shell") {
426+ !callManager.hasCalls && !tutorial.running) {
436427 // We don't want to simply call greeter.showNow() here, because
437428 // that will take too long. Qt will delay button event
438429 // handling until the greeter is done loading and may think the
@@ -445,6 +436,14 @@ Item {
445436 greeter.showGreeterDelayed.start();
446437 }
447438 }
439+
440+ Timer {
441+ id: showGreeterDelayed
442+ interval: 1
443+ onTriggered: {
444+ greeter.forceShow();
445+ }
446+ }
448447 }
449448
450449 function showHome() {