Fix remove button displayed in non-edit mode