more fix for editor focus