--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Fri May 08 08:18:43 2009 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp	Fri Jul 03 15:46:41 2009 +0100
@@ -3066,7 +3066,8 @@
     {
     delete(iShortcutKeyMap);
     iShortcutKeyMap = NULL;
-    UpdateCbaL();
+    TRAP_IGNORE(UpdateCbaL());
+    TRAP_IGNORE(UpdateFullScreenL());
     }
 
 // ---------------------------------------------------------------------------
@@ -3153,7 +3154,7 @@
         {
 #ifdef RD_SCALABLE_UI_V2
         if ( Layout_Meta_Data::IsLandscapeOrientation() )
-           StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS);
+           StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS);
 #endif
         StatusPane()->MakeVisible( ETrue );
         iContainer->SetRect(ClientRect());
@@ -3289,7 +3290,6 @@
 		 	&& !iOptionsMenuActive
 		 	&& !ApiProvider().IsDisplayingMenuOrDialog()
 			&& !ApiProvider().WindowMgr().CurrentWindow()->WMLMode()
-			&& !IsEditMode()
 			&& !iIsPluginFullScreenMode)
     		{
 			EnableFullScreenModeL( ETrue);