Simplify solution to only scroll to primary selection