Fix dialog select, take 18 :(