Love the new guide but “aaaaaargh” with favorites!

Love the new guide, but I find it too easy to unfavorite a channel when the guide first comes on. Since all you have to do to favorite/unfave a channel is click on the channel, if I don’t notice that the guide selector is on the channel and not a program it’s way too easy to unfave it. Then the guide reverts to the previous channel, and to re-favorite the channel I have to scroll through ALL of them to find it again (I know there are ways to find the channel # but at 5:00 am when I’m half awake I take the path of least resistance). Even though this has happened more than I’d like to admit, it STILL happens because hey, I’m human and not always paying attention. I’ll be embarrassed if there’s a simple fix, but if there is one please let me know!