diff -r 25957ccd51ab -r b3594157d381 src/screensaverctrlplugin.cpp
--- a/src/screensaverctrlplugin.cpp	Fri Mar 12 15:42:50 2010 +0200
+++ b/src/screensaverctrlplugin.cpp	Mon Mar 15 12:40:37 2010 +0200
@@ -291,12 +291,13 @@
 
     View()->SetDisplayObject( Model().SharedDataInterface()->DefaultScreensaverType() );
 
+    CScreensaverEngine& model = MUTABLE_CAST( CScreensaverEngine&, Model() );
+    model.SetExpiryTimerTimeout( KDefaultScreenSaverTimeout );
+
     View()->ShowDisplayObject();
     
     if ( aTime >= 0 )
         {
-        CScreensaverEngine& model = MUTABLE_CAST( CScreensaverEngine&, Model() );
-        
         model.StartSuspendTimer( aTime );
         }
     }
@@ -385,6 +386,8 @@
 //
 void CScreensaverCtrlPlugin::RequestTimeout( TInt aSecs )
     {
+    CScreensaverEngine& model = MUTABLE_CAST( CScreensaverEngine&, Model() );
+    model.SetExpiryTimerTimeout( 0 );
     StartPluginTimeoutTimer( aSecs );
     }