--- a/calendarui/controller/src/calenviewmanager.cpp	Fri May 14 15:51:09 2010 +0300
+++ b/calendarui/controller/src/calenviewmanager.cpp	Thu May 27 12:51:15 2010 +0300
@@ -396,9 +396,11 @@
 		        // This happens when settings view or event viewer is opened
 		        // from the agenda view. Simply repopulate the view
 		    	if (mCalenDayView) {
+		    		// Remove month view from mainwindow.
+		    		mController.MainWindow().removeView(mCalenMonthView);
 					mCalenDayView->doPopulation();
 					mController.MainWindow().setCurrentView(mCalenDayView);
-		    	}
+		    	} 
 		    } else if (mController.MainWindow().currentView() == mCalenDayViewAlt){
 		        // This happens when settings view or event viewer is opened
 		        // from the agenda view. Simply repopulate the view
@@ -502,14 +504,12 @@
 	switch (command.Command()) {
 		case ECalenMonthView:
 		    removeDayViews();
-			// Add month view to mainwindow.
+		    // Add month view to mainwindow.
 			mController.MainWindow().addView(mCalenMonthView);
 			mCurrentViewId = ECalenMonthView;
 			activateCurrentView();
 			break;
 		case ECalenDayView:
-			// Remove month view from mainwindow.
-			mController.MainWindow().removeView(mCalenMonthView);
 			mCurrentViewId = ECalenDayView;
 			activateCurrentView();
 			break;