Fixing bug where other non coded required two clicks to select