Improve keyboard observers handle