Hi Michaela
My DD tends to be okay for a while when she wakes up (she will entertain herself talking to her toys and singing). She gets to a point though were she's clearly had enough of playing by herself and wants to get up, then she starts whining and crying a bit.
One thing I learnt with DD is that I can't leave the room and leave her in her cot once I've been in (she wants to get up then and screams blue murder if I leave the room again - if I have to answer the phone or get something). So I make sure I've done everything I need to do before I go into her (washed, dressed, teeth brushed, cuppa for me, finding any clothes and stuff I need for her) . It's much better for me to leave her in there whining a little (it's not consistent, just off and on) than to go in and come out again (because then we get full blown screaming).
Hope that makes sense.
love