Fix Bug Introduced in Shell Selectiong