Fix for misbehaving menu/back buttons