Fixing edit -> focus problem