diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 72b9f0f5d..6ca1862b2 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -872,7 +872,11 @@ void KRootWm::slotPopulateSessions()
 void KRootWm::slotSessionActivated( int ent )
 {
     if (ent > 0 && !sessionsMenu->isItemChecked( ent )) {
-        DM().lockSwitchVT( ent );
+        m_pSaver->lockScreen();
+        if (!m_pSaver->waitForLockEngage()) {
+            return;
+        }
+        DM().switchVT( ent );
     }
 }