diff --git a/src/DatetimePopup.vue b/src/DatetimePopup.vue
index a64a672..2ca0ab9 100644
--- a/src/DatetimePopup.vue
+++ b/src/DatetimePopup.vue
@@ -2,7 +2,7 @@
   <div class="vdatetime-popup">
     <div class="vdatetime-popup__header">
       <div class="vdatetime-popup__year" @click="showYear" v-if="type !== 'time'">{{ year }}</div>
-      <div class="vdatetime-popup__date" v-if="type !== 'time'">{{ dateFormattedDay }} <span @click="showMonth" class="vdatetime-popup__month">{{ dateFormattedMonth }}</span></div>
+      <div class="vdatetime-popup__date" @click="showMonth" v-if="type !== 'time'">{{ dateFormatted }}</div>
     </div>
     <div class="vdatetime-popup__body">
       <datetime-year-picker
@@ -158,16 +158,11 @@ export default {
     minute () {
       return this.newDatetime.minute
     },
-    dateFormattedDay () {
-      return this.newDatetime.toLocaleString({
-        day: 'numeric'
-      })
-    },
-    dateFormattedMonth () {
+    dateFormatted () {
       return this.newDatetime.toLocaleString({
         month: 'long',
         day: 'numeric'
-      }).substr(('' + this.day).length + 1)
+      })
     },
     minDatetimeUTC () {
       return this.minDatetime ? this.minDatetime.toUTC() : null
@@ -208,7 +203,7 @@ export default {
     },
     showMonth () {
       this.step = 'month'
-      this.flow.diversion('date')
+      this.flowManager.diversion('date')
     },
     confirm () {
       this.nextStep()
@@ -337,8 +332,4 @@ export default {
     color: #444;
   }
 }
-
-.vdatetime-popup__month {
-  cursor: pointer;
-}
 </style>
diff --git a/test/specs/DatetimePopup.spec.js b/test/specs/DatetimePopup.spec.js
index 965ddf3..3ed4494 100644
--- a/test/specs/DatetimePopup.spec.js
+++ b/test/specs/DatetimePopup.spec.js
@@ -160,6 +160,25 @@ describe('DatetimePopup.vue', function () {
       })
     })
 
+    it('should render the month picker', function (done) {
+      const vm = createVM(this,
+        `<DatetimePopup :datetime="datetime"></DatetimePopup>`,
+        {
+          components: { DatetimePopup },
+          data () {
+            return {
+              datetime: LuxonDatetime.local()
+            }
+          }
+        })
+
+      vm.$('.vdatetime-popup__date').click()
+      vm.$nextTick(() => {
+        expect(vm.$('.vdatetime-popup__body .vdatetime-month-picker')).to.exist
+        done()
+      })
+    })
+
     it('should render the calendar on confirm in year picker', function (done) {
       const vm = createVM(this,
         `<DatetimePopup :datetime="datetime"></DatetimePopup>`,