bugfix for the first time set focus
Merge branch 'cim' into bugfix