Fixing focus bug (hopefully for the last time).