--- a/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Wed Mar 31 21:06:44 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Wed Apr 14 15:41:04 2010 +0300
@@ -374,7 +374,8 @@
         iController.CurrentMode() == ECamControllerShutdown )
         {
         if( !iController.IsViewFinding() && iViewFinding 
-           && IsCaptureKeyL( aKeyEvent, aType ) )             
+            && ( IsCaptureKeyL( aKeyEvent, aType )
+            || IsShutterKeyL( aKeyEvent, aType ) ) )
             {
             PRINT( _L("Camera <> CCamCaptureSetupContainer::OfferKeyEventL coming back from standby" ))
             ReserveAndStartVF();
@@ -391,9 +392,11 @@
         // If VF was stopped by stand-by-timer, restart VF here
         ReserveAndStartVF();
         }
-
-    // If the Ok button is pressed, select the current item
-    if ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey )
+    
+    // If the Ok button or shutter key is pressed, select the current item
+    if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) ||
+         ( aType == EEventKeyDown && 
+         ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) )  
         {
         TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType );
         iView.HandleCommandL( EAknSoftkeyOk );