Fixes keep_focus and forward_sync
Merge pull request #337 from petereichinger/master

Fixes keep_focus and forward_sync