--- a/landmarksui/app/src/CLmkCategoryContentsContainer.cpp	Tue Feb 02 00:16:03 2010 +0200
+++ b/landmarksui/app/src/CLmkCategoryContentsContainer.cpp	Fri Feb 19 22:45:00 2010 +0200
@@ -173,8 +173,8 @@
     CLmkAppSelectorImplBase& selector = SelectorImpl();
     TInt markedCount(selector.ListMarkedItemCountL());
     TInt visibleCount(selector.ListVisibleItemCount());
-    DEBUG1( CLmkByLmContainer::OfferKeyEventL markedCount=%d,markedCount );
-    DEBUG1( CLmkByLmContainer::OfferKeyEventL visibleCount=%d,visibleCount );
+    DEBUG1( CLmkCategoryContentsContainer::OfferKeyEventL markedCount=%d,markedCount );
+    DEBUG1( CLmkCategoryContentsContainer::OfferKeyEventL visibleCount=%d,visibleCount );
 
     if (aKeyEvent.iCode == EKeyOK && !shiftKeyPressed && aType == EEventKey)
         {
@@ -232,14 +232,8 @@
     iIsEditorOpened = EFalse;
     TKeyResponse response = CLmkLbWithFilterContainer::OfferKeyEventL(
             aKeyEvent, aType);
-
-    if (static_cast<CTextListBoxModel*> (ListBox().Model())->ItemTextArray()->MdcaCount()
-            == 0)
-        {
-        (static_cast<CLmkCategoryContentsView *> (&iView))->HandleCommandL(
-                EAknSoftkeyBack);
-        }
-
+    
+    DEBUG( CLmkCategoryContentsContainer::OfferKeyEventL End );
     return response;
     }
 
@@ -255,6 +249,15 @@
         {
         SelectorImpl().ProcessCommandL(ELmkCmdFindBoxSearchAfresh);
         }
+    if (aEventType == EEventStateChanged && aControl == iListBox )
+        {
+        if (static_cast<CTextListBoxModel*> (ListBox().Model())->ItemTextArray()->MdcaCount()
+                == 0)
+            {
+            (static_cast<CLmkCategoryContentsView *> (&iView))->HandleCommandL(
+                    EAknSoftkeyBack);
+            }
+        }
     }
 
 // ----------------------------------------------------------------------------