diff --git a/src/invent.c b/src/invent.c
index 3fe7e29f5..75133d650 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -2115,7 +2115,8 @@ askchain(
     ininv = (*objchn == g.invent);
     bycat = (menu_class_present('u')
              || menu_class_present('B') || menu_class_present('U')
-             || menu_class_present('C') || menu_class_present('X'));
+             || menu_class_present('C') || menu_class_present('X')
+             || menu_class_present('P'));
 
     /* someday maybe we'll sort by 'olets' too (temporarily replace
        flags.packorder and pass SORTLOOT_PACK), but not yet... */
diff --git a/src/pickup.c b/src/pickup.c
index 79f74ebc1..0882d618d 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -3047,6 +3047,7 @@ menu_loot(int retry, boolean put_in)
                 loot_justpicked = TRUE;
                 count = max(0, pick_list[i].count);
                 add_valid_menu_class(pick_list[i].item.a_int);
+                loot_everything = FALSE;
             } else if (pick_list[i].item.a_int == ALL_TYPES_SELECTED) {
                 all_categories = TRUE;
             } else {