--- a/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Tue Apr 27 16:19:06 2010 +0300
@@ -399,7 +399,17 @@
          ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) )  
         {
         TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType );
-        iView.HandleCommandL( EAknSoftkeyOk );
+        if ( aType == EEventKeyDown && IsShutterKeyL( aKeyEvent, aType ) && 
+            ( ECamSettingItemDynamicPhotoFlash == iControlHandler.SettingType() ||
+            ECamSettingItemDynamicSelfTimer == iControlHandler.SettingType() ) )
+            {
+            iView.HandleCommandL( EAknSoftkeyCancel );
+            }
+            else
+            {
+            iView.HandleCommandL( EAknSoftkeyOk );
+            }
+        
         return response;
         }
     return iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType );