Fix Finder focus handling