--- a/mpxplugins/viewplugins/views/metadataeditordialog/src/mpxmetadataeditordialog.cpp	Thu Dec 17 08:45:05 2009 +0200
+++ b/mpxplugins/viewplugins/views/metadataeditordialog/src/mpxmetadataeditordialog.cpp	Thu Jan 07 12:45:53 2010 +0200
@@ -2062,10 +2062,12 @@
                 else
                     {
                     // Text query cancelled.  Display popup list again.
-                    iTextValues->SetCurrentValueIndex( 0 );
                     iPopup->ActivateSelectionListL();
-                    // genre is fetched so that "Custom..." isn't passed as the new genre
-                    FetchGenreL();
+                    
+                    // reset to original index
+                    TInt genreIndex;
+                    iGenreArr->Find( iMedia->ValueText( KMPXMediaMusicGenre ), genreIndex );
+                    iTextValues->SetCurrentValueIndex( genreIndex );
                     }
                 CleanupStack::PopAndDestroy( genreName );
                 }