[BUG] Fixed poor handling of top-level dropdown buttons