Should I wake up my baby if her nap is too long?

My almost 5-mth-old is not sleeping well at night because she wouldn't sleep in her own crib and when I put her to my bed we both are not getting enough sleep. I tried to put her to her crib again this morning for her morning nap and she still wouldn't fall asleep by herself. So after 1.5 hour I picked her up and let her sit on the couch with me until she was very very ready to go sleep. Now she's been sleeping for 2 hours. I know it's because she didn't sleep well last night but should I wake her up so she won't stay up again tonight? If she cries for another 2 hours tonight again I think my neighbours upstairs will come down here and give me xxxx.