--- a/remotestoragefw/gsplugin/data/rsfwgspluginrsc.rss	Thu Dec 17 09:07:59 2009 +0200
+++ b/remotestoragefw/gsplugin/data/rsfwgspluginrsc.rss	Thu Jan 07 13:15:09 2010 +0200
@@ -212,11 +212,13 @@
             {
             command = EGSCmdAppChange;
             txt = qtn_options_change; 
+            flags = EEikMenuItemAction;
             },
         MENU_ITEM 
             {
             command = EGSCmdAppEdit;
-            txt = qtn_rd_opt_edit; 
+            txt = qtn_rd_opt_edit;
+            flags = EEikMenuItemSpecific;
             },
         MENU_ITEM
             {
@@ -227,21 +229,25 @@
             {
             command = EGSCmdAppConnect;
             txt = qtn_rd_opt_connect;
+            flags = EEikMenuItemSpecific;
             },
         MENU_ITEM
             {
             command = EGSCmdAppDisconnect;
             txt = qtn_rd_opt_disconnect;
+            flags = EEikMenuItemSpecific;
             },
         MENU_ITEM
             {
             command = EGSCmdAppSendLink;
             txt = qtn_rd_opt_send_link;
+            flags = EEikMenuItemSpecific;
             },            
         MENU_ITEM
             {
             command = EGSCmdAppDelete;
             txt = qtn_rd_opt_delete;
+            flags = EEikMenuItemSpecific;
             }       
         };
     }

--- a/remotestoragefw/gsplugin/src/rsfwgsplugindrivelistcontainer.cpp	Thu Dec 17 09:07:59 2009 +0200
+++ b/remotestoragefw/gsplugin/src/rsfwgsplugindrivelistcontainer.cpp	Thu Jan 07 13:15:09 2010 +0200
@@ -324,7 +324,7 @@
     {
     // if the Select Key has been pressed
     if ((aListBoxEvent == MEikListBoxObserver::EEventEnterKeyPressed) ||
-    (aListBoxEvent == MEikListBoxObserver::EEventItemClicked))
+    (aListBoxEvent == MEikListBoxObserver::EEventItemSingleClicked))
         {
         EditCurrentItemL();           
         }

--- a/remotestoragefw/gsplugin/src/rsfwgsremotedrivesettingscontainer.cpp	Thu Dec 17 09:07:59 2009 +0200
+++ b/remotestoragefw/gsplugin/src/rsfwgsremotedrivesettingscontainer.cpp	Thu Jan 07 13:15:09 2010 +0200
@@ -200,7 +200,7 @@
     {
     // if the Select Key has been pressed
     if ((aListBoxEvent == MEikListBoxObserver::EEventEnterKeyPressed) ||
-    (aListBoxEvent == MEikListBoxObserver::EEventItemClicked))
+    (aListBoxEvent == MEikListBoxObserver::EEventItemSingleClicked))
         {
         iSettingList->EditCurrentItemL();
         }