ui refactor: fix for lost selection