Fix #195 and fix 'esc' with keyboard controller in general