Fixes keep_focus and forward_sync