diff --git a/data/ui/month-view.ui b/data/ui/month-view.ui
index b3488e5b..7b2aa44c 100644
--- a/data/ui/month-view.ui
+++ b/data/ui/month-view.ui
@@ -147,7 +147,7 @@
   <object class="GtkPopover" id="overflow_popover">
     <property name="can-focus">false</property>
     <property name="position">bottom</property>
-    <signal name="drag-motion" handler="cancel_dnd_from_overflow_popover" object="GcalMonthView" swapped="yes" />
+    <signal name="drag-motion" handler="cancel_dnd_from_overflow_popover" object="GcalMonthView" swapped="no" />
     <style>
       <class name="events" />
     </style>
diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c
index 6d809ae2..8c3027e0 100644
--- a/src/views/gcal-month-view.c
+++ b/src/views/gcal-month-view.c
@@ -723,11 +723,13 @@ gcal_month_view_key_press (GtkWidget   *widget,
 }
 
 static gboolean
-cancel_dnd_from_overflow_popover (GtkWidget *popover)
+cancel_dnd_from_overflow_popover (GtkPopover *popover)
 {
-  gtk_widget_hide (popover);
+  GCAL_ENTRY;
 
-  return FALSE;
+  gtk_popover_popdown (popover);
+
+  GCAL_RETURN (FALSE);
 }
 
 static gboolean