diff --git a/data/ui/month-popover.ui b/data/ui/month-popover.ui
index 3fc31166..3433e05c 100644
--- a/data/ui/month-popover.ui
+++ b/data/ui/month-popover.ui
@@ -89,7 +89,7 @@
             <property name="visible">true</property>
             <property name="relief">none</property>
             <property name="label" translatable="yes">New Event…</property>
-            <signal name="clicked" handler="new_event_button_clicked_cb" object="GcalMonthPopover" />
+            <signal name="clicked" handler="new_event_button_clicked_cb" object="GcalMonthPopover" swapped="no" />
           </object>
         </child>
 
diff --git a/src/views/gcal-month-popover.c b/src/views/gcal-month-popover.c
index 042af573..6a99a28f 100644
--- a/src/views/gcal-month-popover.c
+++ b/src/views/gcal-month-popover.c
@@ -18,6 +18,7 @@
 
 #define G_LOG_DOMAIN "GcalMonthPopover"
 
+#include "gcal-debug.h"
 #include "gcal-event-widget.h"
 #include "gcal-month-popover.h"
 #include "gcal-utils.h"
@@ -399,10 +400,16 @@ new_event_button_clicked_cb (GtkWidget        *button,
   GActionMap *map;
   GAction *action;
 
+  GCAL_ENTRY;
+
   map = G_ACTION_MAP (g_application_get_default ());
   action = g_action_map_lookup_action (map, "new");
 
+  gcal_month_popover_popdown (self);
+
   g_action_activate (action, NULL);
+
+  GCAL_EXIT;
 }
 
 static void