--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Mon Mar 15 12:40:52 2010 +0200
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp	Wed Mar 31 21:35:49 2010 +0300
@@ -1524,7 +1524,10 @@
                 {
                 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
                 }
-            const CFavouritesItem* item =  TheContainer()->Listbox()->CurrentItem();
+            const CFavouritesItem* item;
+            if(TheContainer() && TheContainer()->Listbox()) 
+               item =  TheContainer()->Listbox()->CurrentItem();
+               
             if  ( ( item ) &&
                   ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) ||
                     ( item->ContextId() != NULL ) )
@@ -2195,7 +2198,10 @@
     {
     Toolbar()->SetItemDimmed( EWmlCmdAddBookmark, aDimButtons , ETrue );
     Toolbar()->SetItemDimmed( EWmlCmdGoToAddress, aDimButtons , ETrue );
+    Toolbar()->SetItemDimmed( EWmlCmdGoToAddressAndSearch, aDimButtons , ETrue );
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
     Toolbar()->SetItemDimmed( EWmlCmdDelete, aDimButtons , ETrue );
+#endif
     if (!aDimButtons)
         {
         // when undimming buttons we may not want them all back on