diff --git a/src/do.c b/src/do.c
index 3af8262a4..67476a450 100644
--- a/src/do.c
+++ b/src/do.c
@@ -659,8 +659,10 @@ int retry;
 	/* Gather valid classes via traditional NetHack method */
 	i = ggetobj("drop", drop, 0, TRUE, &ggoresults);
 	if (i == -2) all_categories = TRUE;
-	if (ggoresults & ALL_FINISHED)
-		return i;
+	if (ggoresults & ALL_FINISHED) {
+		n_dropped = i;
+		goto drop_done;
+	}
     }
 
     if (drop_everything) {