Fix possible bug around app selection