diff --git a/src/components/MdDatepicker/MdDatepickerDialog.vue b/src/components/MdDatepicker/MdDatepickerDialog.vue
index fb3e3a59a..beacd6c14 100644
--- a/src/components/MdDatepicker/MdDatepickerDialog.vue
+++ b/src/components/MdDatepicker/MdDatepickerDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <md-popover :md-settings="popperSettings" md-active>
+  <md-popover :md-settings="popperSettings" md-active @mounted="OnPopoverMounted">
     <transition name="md-datepicker-dialog" appear @enter="setContentStyles" @after-leave="resetDate">
       <div class="md-datepicker-dialog" :class="[$mdActiveTheme]">
         <div class="md-datepicker-header">
@@ -146,7 +146,8 @@
       monthAction: null,
       currentView: 'day',
       contentStyles: {},
-      availableYears: null
+      availableYears: null,
+      popover: null
     }),
     computed: {
       firstDayOfAWeek () {
@@ -260,6 +261,9 @@
       }
     },
     methods: {
+      OnPopoverMounted(popover) {
+        this.popover = popover
+      },
       setContentStyles () {
         const months = getElements(this.$el, '.md-datepicker-month')
 
@@ -349,6 +353,11 @@
     created () {
       this.setAvailableYears()
       this.resetDate()
+    },
+    activated() {
+      if(this.popover && this.popover.popperInstance) {
+        this.$nextTick(() => this.popover.popperInstance.update())
+      }
     }
   })
 </script>
diff --git a/src/components/MdPopover/MdPopover.vue b/src/components/MdPopover/MdPopover.vue
index 6af82bc42..574202d0d 100644
--- a/src/components/MdPopover/MdPopover.vue
+++ b/src/components/MdPopover/MdPopover.vue
@@ -108,6 +108,7 @@
     },
     mounted () {
       this.resetPopper()
+      this.$emit('mounted', this)
     },
     render (createElement) {
       return createElement(MdPortal, {