Fix selected on go to