XBMC returns to main menu

Whenever a video ends, or I want to stop playing it (press esc or right click on mouse) XBMC returns all the way to the main menu.
Afterwards I need to go through the whole navigation menu again...super annoying...is there anyway to correct this?

I'm pretty sure everything worked fine the first few times I used it...not sure what happened.