diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c
index e5f34ac629..c4871f106e 100644
--- a/gtk/gtkdroptarget.c
+++ b/gtk/gtkdroptarget.c
@@ -507,13 +507,19 @@ gtk_drop_target_handle_crossing (GtkEventController    *controller,
       graphene_point_init (&self->coords, x, y);
       gtk_drop_target_start_drop (self, crossing->drop);
 
-      g_signal_emit (self, signals[ENTER], 0, x, y, &preferred);
-        if (!gdk_drag_action_is_unique (preferred))
-          {
-            g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action",
-                        G_OBJECT_TYPE_NAME (widget), widget);
-            preferred = make_action_unique (preferred);
-          }
+      /* start_drop ends w/ thaw_notify, where handler may reject, so recheck */
+      if (self->drop != NULL)
+        g_signal_emit (self, signals[ENTER], 0, x, y, &preferred);
+      else
+        preferred = 0;
+
+      if (!gdk_drag_action_is_unique (preferred))
+        {
+          g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action",
+                      G_OBJECT_TYPE_NAME (widget), widget);
+          preferred = make_action_unique (preferred);
+        }
+
       if (preferred &&
           gtk_drop_status (self->drop, self->actions, preferred))
         {
@@ -533,6 +539,7 @@ gtk_drop_target_handle_crossing (GtkEventController    *controller,
       g_signal_emit (self, signals[LEAVE], 0);
       if (!self->dropping)
         gtk_drop_target_end_drop (self);
+
       gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_DROP_ACTIVE);
     }
 }