diff --git a/js/ui/main.js b/js/ui/main.js
index f727a661b..b0a8c2d34 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -84,8 +84,6 @@ function _sessionUpdated() {
                                   Shell.KeyBindingMode.NORMAL |
                                   Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
-    if (sessionMode.isGreeter && screenShield)
-        screenShield.showDialog();
 }
 
 function start() {
@@ -191,6 +189,12 @@ function _initializeUI() {
     ExtensionDownloader.init();
     ExtensionSystem.init();
 
+    if (sessionMode.isGreeter && screenShield) {
+        layoutManager.connect('startup-prepared', function() {
+            screenShield.showDialog();
+        });
+    }
+
     layoutManager.connect('startup-complete', function() {
                               if (keybindingMode == Shell.KeyBindingMode.NONE) {
                                   keybindingMode = Shell.KeyBindingMode.NORMAL;