2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index dd4411b60e..4b47d18b65 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -288,6 +288,10 @@ public class VCalendarPanel extends FocusableFlexTable implements
 
     public void setResolution(int resolution) {
         this.resolution = resolution;
+        if (time != null) {
+            time.removeFromParent();
+            time = null;
+        }
     }
 
     private boolean isReadonly() {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index b0c8523753..4e7d70e5c5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -161,6 +161,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         if (calendar.getResolution() != currentResolution) {
             calendar.setResolution(currentResolution);
             if (calendar.getDate() != null) {
+                calendar.setDate(getCurrentDate());
                 // force re-render when changing resolution only
                 calendar.renderCalendar();
             }