diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 271581dff..c8681c6df 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -603,6 +603,10 @@ bool LockProcess::dontLock()
 //---------------------------------------------------------------------------
 void LockProcess::quitSaver()
 {
+    if (closeCurrentWindow()) {
+        TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
+        return;
+    }
     stopSaver();
     kapp->quit();
 }