Minor updates to secondary click handler.