Lightbox navigation with portfolio filtering

I’m preparing a photography portfolio site for a client using Enfold. I have set up each image as a portfolio item with just a Title and Featured Image and categorised items using a series of categories. This works great as far as filtering images and presenting thumbnails goes, and the native lightbox looks great. However, once the portfolio is filtered, the lightbox continues to navigate through the images without regard to the filtering applied to the page. For example, it still navigates through images that have not been isolated by the filter.

How can I resolve this so that the lightbox only navigates through the portfolio items that have been set by the filter? Is this possible using the native lightbox? If not, can you recommend another solution, perhaps using another plugin?

Many thanks. The theme is otherwise fantastic.