UI Question

So when I am working within a client screen and it shows a list of overdue or unpaid invoices for that client I click on one invoice to mark it paid and add the info. Once I hit enter it takes me back to the main invoice screen and then I have to re-navigate back to that client or invoice again. I think it should take you back to the last screen you were working on not the main invoice screen especially since the search bar has been removed. Any comments or work arounds on this?