Fix issue with stash selection and removal