Preventing selection of current item were it to be made visible

This PR prevents the currently selected item from responding to clicks - normally the item isn't visible, in which case such code isn't necessary, but if the item is made visible (e.g. via a post-render hook or something similar) then this code is necessary.