Calculate remaining time for Fajr straight after Isha

The next prayer countdown doesn’t show prayers from the next Fajr – once Isha is finished, the countdown becomes empty instead of going to the next day’s Fajr, and the [daily_next_prayer] shortcode also doesn’t highlight it as being next until midnight.

I’ve had a look at the code, and there does seem to be some effort to detect for the next day’s Fajr, but obviously this is unfinished, and I feel it’s beyond my capabilities. Will this be possible to implement?