--- a/webengine/webkitutils/ToolBar/ToolBar.cpp	Fri Jul 03 15:54:40 2009 +0100
+++ b/webengine/webkitutils/ToolBar/ToolBar.cpp	Thu Aug 27 07:44:59 2009 +0300
@@ -390,7 +390,7 @@
 // ----------------------------------------------------------------------------
 void CToolBar::UpdateCursorPosition()
 {
-    if (iButtonArray->Length() > 0 && iButtonArray->Length() >= iFocusedButtonIndex) {
+    if (iButtonArray->Count() > iFocusedButtonIndex) {
         CToolBarButton* b = iButtonArray->At(iFocusedButtonIndex);
         if (b) {
             TPoint pt = iPosition + b->Position() + TPoint(b->Size().iWidth/2,b->Size().iHeight/2);
@@ -731,6 +731,7 @@
             case EToolBarViewImages:
                 {
                 TRAP_IGNORE(iToolBarCallback->ViewImagesL());
+                TRAP_IGNORE(iToolBarCallback->CloseToolBarL());
                 break;
                 }