--- a/clock2/clockui/uilayer/clockworldview/src/clockworldview.cpp	Wed Mar 31 21:29:10 2010 +0300
+++ b/clock2/clockui/uilayer/clockworldview/src/clockworldview.cpp	Wed Apr 14 15:55:57 2010 +0300
@@ -150,11 +150,20 @@
 			//Single click integration
             // If current item is other than home location set it as new home
 		    // location
-		    if ( iContainer->ListBox()->CurrentItemIndex() > KZerothIndex )
+		    RClkSrvInterface clkSrvInterface;
+            User::LeaveIfError( clkSrvInterface.Connect() );
+
+            TBool timeUpdateOn( EFalse );
+          
+            // Get the state of the plugin.
+            clkSrvInterface.IsAutoTimeUpdateOn( timeUpdateOn );
+		    if ( iContainer->ListBox()->CurrentItemIndex() > KZerothIndex || timeUpdateOn)
                 {
                 SetHomeLocationL();
                 }
 
+		    // Cleanup.
+		    clkSrvInterface.Close();
 		    }
 		    break;
 		    
@@ -294,7 +303,7 @@
     __PRINTS( "CClockWorldView::DynInitMenuBarL - Entry" );
     
 	//single click integration
-    if( aMenuBar && ( IsSelectionListOpen() || IsGalleryOpen() ) )
+    if( aMenuBar && ( /*IsSelectionListOpen() || */IsGalleryOpen() ) )
         {
         // If the selection list open, we should not display the menupane.
         aMenuBar->StopDisplayingMenuBar();