diff -r 8b2d6d0384b0 -r dbec5787fa68 camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamdefaultnamesettingpage.cpp
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamdefaultnamesettingpage.cpp	Tue Feb 02 00:01:39 2010 +0200
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamdefaultnamesettingpage.cpp	Fri Feb 19 22:36:31 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -52,6 +52,7 @@
       iMode( aMode ),
       iCamera ( aCamera )
     {
+    iNameSelected  = QueryValue()->CurrentValueIndex();
     }
     
 
@@ -105,6 +106,11 @@
             }
            
         }
+    else  
+        {
+        // Cancelled
+        QueryValue()->SetCurrentValueIndex( iNameSelected );
+        }
     return ETrue;
     }