We had a problem with Tom scratching his face in his sleep and waking himself up. He likes to be wrapped but kept wriggling out of his blanket. I ended up buying a Swaddle wrap - one of the ones that does up with valcro. He cant get his hands free - although he looks funny, like a little wrapped up mummy! Good luck and for little Ethan.