--- a/calendarui/views/src/calentodoview.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/views/src/calentodoview.cpp	Fri Feb 19 22:49:53 2010 +0200
@@ -288,11 +288,13 @@
         case ECalenViewCurrentEntry:
         case EAknSoftkeyOpen:
             SaveCurrentItemIndexL();
-           if(!Container()->IsEmptyView())
+          
+           if(!Container()->IsEmptyView() && !iEventViewCommandHandled)
                {
                if(!Container()->MarkedCount())
                    {
                    CCalenNativeView::HandleCommandL(ECalenEventView);
+                   iEventViewCommandHandled = ETrue;
                    break;
                    }
                
@@ -731,6 +733,7 @@
         // dim clear and clear all toolbar buttons
         toolbar.SetItemDimmed(ECalenGotoToday,ETrue,ETrue);
         }
+    iEventViewCommandHandled = EFalse;
     
     TRACE_EXIT_POINT;
     }