Narrowed the scope of selection for delete button selection.
Fixed TIM-650