Repair tabbing out & improved other-focus detection

Previous commit broke the tabbing behavior, sorry.