Fix key-binding problems.

Though, should be addressed finally by a refactor.