Fix keyboard-initiated way moving