--- a/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp	Tue May 11 16:02:39 2010 +0300
+++ b/idlehomescreen/widgetmanager/src/wmmaincontainer.cpp	Tue May 25 12:29:32 2010 +0300
@@ -1224,8 +1224,17 @@
     if ( iFindbox && !iFindPaneIsVisible &&
             iWidgetsList->Model()->NumberOfItems() > KMinWidgets )
         {
-        // reset focus
-        ResetFocus();
+        // set focus
+        if ( iWidgetsList->ItemDrawer()->Flags() 
+                & CListItemDrawer::ESingleClickDisabledHighlight )
+            {
+            ResetFocus();
+            }
+        else
+            {
+            iWidgetsList->SetFocus( ETrue, EDrawNow );                
+            }
+        
         
         // set column filter flag
         TBitFlags32 bitFlag;
@@ -1296,7 +1305,16 @@
             m->RemoveFilter();
             }
         
-        ResetFocus();
+        //set focus
+        if ( iWidgetsList->ItemDrawer()->Flags() 
+                & CListItemDrawer::ESingleClickDisabledHighlight )
+            {
+            ResetFocus();
+            }
+        else
+            {
+            iWidgetsList->SetFocus( ETrue, EDrawNow );                
+            }
 
         iFindbox->MakeVisible( EFalse );        
         iFindPaneIsVisible = EFalse;        
@@ -1488,6 +1506,19 @@
             {
             AddWidgetToHomeScreenL();
             }
+        else
+            {
+            if ( iWidgetsList->ItemDrawer()->Flags() 
+                    & CListItemDrawer::ESingleClickDisabledHighlight )
+                {
+                ResetFocus();
+                }
+            else
+                {
+                iWidgetsList->SetFocus( ETrue, EDrawNow );
+                UpdateFocusMode();
+                }
+            }
         }
     }