Added focus listeners
Fix
Fix