--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Fri Feb 19 22:53:19 2010 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Fri Mar 12 15:43:05 2010 +0200
@@ -2192,7 +2192,9 @@
 //
 void CBrowserBookmarksView::DimToolbarButtons(TBool aDimButtons)
     {
-    Toolbar()->SetDimmed(aDimButtons);
+    Toolbar()->SetItemDimmed( EWmlCmdAddBookmark, aDimButtons , ETrue );
+    Toolbar()->SetItemDimmed( EWmlCmdGoToAddress, aDimButtons , ETrue );
+    Toolbar()->SetItemDimmed( EWmlCmdDelete, aDimButtons , ETrue );
     if (!aDimButtons)
         {
         // when undimming buttons we may not want them all back on
@@ -2393,8 +2395,7 @@
         sender.SendAddressL( );
         }
 
-    Container()->Listbox()->ClearSelection();
-    Container()->Listbox()->SetCurrentItemIndexAndDraw( 0 );
+    Container()->Listbox()->SetCurrentItemIndexAndDraw( Container()->Listbox()->CurrentItemIndex());
     }