--- a/photosgallery/viewframework/views/metadatadialog/src/glxmetadatacontainer.cpp	Tue Sep 14 21:19:17 2010 +0300
+++ b/photosgallery/viewframework/views/metadatadialog/src/glxmetadatacontainer.cpp	Wed Sep 15 12:13:06 2010 +0300
@@ -1075,7 +1075,7 @@
 				{
 				CleanupStack::PushL(modifiedUri);
 				//Check if media item was renamed
-				if (modifiedUri->Compare(*iUri) != 0)
+				if (modifiedUri->CompareF(*iUri) != 0)
 					{
 					//Set rename command as started since
 					//Rename is also possible from File Manager
@@ -1287,7 +1287,8 @@
         TInt /*aEndIndex*/, MGlxMediaList* /*aList*/)
     {
     TRACER("CGlxMetadataContainer::HandleItemRemovedL()");
-    if (!iItemMediaList->Count() && !iIsPopupShown)
+    //Ignore if this callback corresponds to a rename operation.
+    if (!iItemMediaList->Count() && !iIsPopupShown && !iRenameStarted)
         {
         iDialogObesrver.HandleItemRemovedL();
         }