ATV Guide Focus bug?

When I (often accidentally) select the channel name on the guide rather than the programme on the guide and enter the Upcoming/Specials view of the channel, when I press Menu to return to the guide the focused channel is lost and I am returned to the top of the guide which is little frustrating. Anyone else have this?

Could there be an option to perhaps watch the channel if the channel icon/number is selected rather than see guide information please?