Fix rare bug where the timer interups when we are already processing the adding of the shape
Add keyboard support