diff -r f7816ffc66ed -r 77415202bfc8 apengine/apsettingshandlerui/src/ApSelPopupList.cpp
--- a/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Tue Jan 26 12:12:48 2010 +0200
+++ b/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Tue Feb 02 00:24:11 2010 +0200
@@ -527,7 +527,6 @@
         }
     iList->SetCurrentItemIndexAndDraw( idx );
     SelectCurrentItemL();
-    iOldSelection = idx;
     
     APSETUILOGGER_LEAVEFN( EListbox,"SelPopupList::SetSelectedL")
     }
@@ -787,25 +786,11 @@
         {
         case EEventEnterKeyPressed:
         case EEventItemDoubleClicked:
+        case EEventItemSingleClicked:
             {
             ProcessCommandL( EApSelCmdSelect );
             break;
             }
-        case EEventItemSingleClicked:
-            // Second click to the same item makes the selection and closes the
-            // setting page, first click just moves the radio button mark.
-            {
-            if ( ListBoxControl()->CurrentItemIndex() == iOldSelection )
-                {
-                ProcessCommandL( EApSelCmdSelect );
-                }
-            else
-                {
-                CAknRadioButtonSettingPage::HandleListBoxEventL( aListBox, aEventType );
-                iOldSelection = ListBoxControl()->CurrentItemIndex();
-                }
-            break;
-            }
         case EEventEditingStarted:
             {
             break;