Fixed bug that required to press escape twice to go to normal mode
Removed todo because fixed issue