--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Fri Mar 12 15:43:05 2010 +0200
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Mon Mar 15 12:40:52 2010 +0200
@@ -282,7 +282,6 @@
         }
     switch ( aCommand )
         {
-#ifdef BRDO_SINGLE_CLICK_ENABLED_FF		
         case EWmlCmdSetAsHomePage:
             {
             HBufC* url = ApiProvider().BrCtlInterface().PageInfoLC(TBrCtlDefs::EPageInfoUrl);
@@ -293,8 +292,7 @@
                 }
             CleanupStack::PopAndDestroy(); // url
             break;
-            } 
-#endif			      
+            } 			      
         case EWmlCmdFavourites:
             {
             ApiProvider().SetViewToBeActivatedIfNeededL(
@@ -327,6 +325,14 @@
 		// Set search pane active and then launch editor.	
         case EIsCmdSearchWeb:
             {
+#ifdef BRDO_SINGLE_CLICK_ENABLED_FF 
+            CEikButtonGroupContainer* cba = Cba()->Current();
+            CEikCba* eikCba = static_cast<CEikCba*>( cba->ButtonGroup() );
+            if( eikCba )
+                {
+                eikCba->EnableItemSpecificSoftkey( EFalse );
+                }
+#endif
             iContainer->GotoPane()->SetSearchPaneActiveL();
             LaunchGotoAddressEditorL();
             break;