--- a/mpxplugins/viewplugins/views/addtracksdialog/src/mpxaddtracksdialog.cpp	Tue Jan 26 11:56:33 2010 +0200
+++ b/mpxplugins/viewplugins/views/addtracksdialog/src/mpxaddtracksdialog.cpp	Tue Feb 02 00:09:33 2010 +0200
@@ -126,6 +126,7 @@
         }
     if ( iCollectionUiHelper )
         {
+        iCollectionUiHelper->Cancel();
         iCollectionUiHelper->Close();
         }
     if ( iOrigIcon )
@@ -1104,7 +1105,12 @@
         iAnimIconIndex = 0;
         iPeriodic->Cancel();
         iListModel->SetAnimationIconNum( iSelectIndex, 0 );
-        HighlightListItem( iSelectIndex );
+        TInt bottomIdx = iListBox->BottomItemIndex();
+        TInt topIdx = iListBox->TopItemIndex();
+        if ( topIdx <= iSelectIndex && iSelectIndex <= bottomIdx )
+            {
+            HighlightListItem( iSelectIndex );
+            }
         // restore origional navi pane text
         iNaviPane->Pop( iNaviLabelPane );
         iNaviPane->PushDefaultL();