Multiple Courses and Next Assignment

I have assignments in both an Algebra Course and a Geometry Course.  When I complete an assignment in Algebra and I select the button for next assignment, I get an assignment from the Geometry course instead of the next Algebra assignment.  I think it is because the Geometry has an earlier due date.  I want to limit "Next Assignment" to the current course.  Can that be done?  Thank you so much.