--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Thu May 27 12:46:08 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallappsstate.cpp	Fri Jun 11 13:30:16 2010 +0300
@@ -355,6 +355,8 @@
     // check conditions and hide irrelevant menu items
 
     QSharedPointer<const CaEntry> entry = mAllAppsModel->entry(item->modelIndex());
+    EntryFlags flags = item->modelIndex().data(
+                           CaItemModel::FlagsRole).value<EntryFlags> ();
 
     if (!(entry->attribute(appSettingsPlugin()).isEmpty())) {
         appSettingsAction = mContextMenu->addAction(hbTrId(
@@ -362,14 +364,11 @@
         appSettingsAction->setData(AppSettingContextAction);
     }
     if (!(entry->attribute(componentIdAttributeName()).isEmpty()) && 
-                entry->entryTypeName() == applicationTypeName() ) {
+            (flags & RemovableEntryFlag) ) {
         appDetailsAction = mContextMenu->addAction(hbTrId(
                                                 "txt_common_menu_details"));
         appDetailsAction->setData(AppDetailsContextAction);
-    }    
-    
-    EntryFlags flags = item->modelIndex().data(
-                           CaItemModel::FlagsRole).value<EntryFlags> ();
+    }        
 
     if (!(flags & RemovableEntryFlag)) {
         uninstallAction->setVisible(false);
@@ -406,7 +405,9 @@
                     mSortAttribute, mCollectionsSortAttribute, itemId));
             break;
         case UninstallContextAction:
-            HsMenuService::executeAction(itemId, removeActionIdentifier());
+            machine()->postEvent(
+                HsMenuEventFactory::createUninstallApplicationEvent(
+                    itemId));
             break;
         case AppSettingContextAction: 
             machine()->postEvent(