Please change the Order of options on the right Click context menu on Baskets.

Intead of Open (the most used) at the top you now have Discard (the most dangerous)

Put Discard at the bottom