Fix inconsistent context menu (Remove vs Delete) #11465