sleeping in crib

Jen
Lately my 6 week old wakes up as soon as we put him in his bassinet/crib to nap. He will be sound asleep in our arms and when we go to put him down, he wakes up within 5 minutes. I only swaddle him at night and that seems to help. Should I start swaddling him for naps too? Any tips?