--- a/src/screensaverappui.cpp	Tue Apr 27 16:38:49 2010 +0300
+++ b/src/screensaverappui.cpp	Tue May 11 16:14:23 2010 +0300
@@ -138,7 +138,6 @@
         {
         return EKeyWasConsumed;
         }
-    iModel->NotifyKeyEventReceived();
 
     if ( aType == EEventKey && aKeyEvent.iCode == EKeyNo )
         {
@@ -155,9 +154,10 @@
             }
         else
             {
-            if ( aType == EEventKeyUp )
+            if ( aType == EEventKeyUp && 
+                 !iModel->SharedDataInterface()->IsKeyguardOn() )
                 {
-                //stop = ETrue;
+                stop = ETrue;
                 }
             }
         }