sug-395 space key locking fixed