Keyboard switching, favor channels in active guild

With the new tweaks to the CTRL K switcher I'm needing to move my hands less and less which is amazing!  One small quirk happens when I'm heading to a channel that exists in multiple guilds, such as "general".  The switcher doesn't favor the active guild's general channel but, instead, lists all the general channels in an unordered manner. This means I need to reach over to an arrow key to select the correct one or use the mouse.

It would be great if the channels were listed with the active guild given favor to be the default selected on "enter".  Then one could pop to a guild with "*Name" and hit the right channel with "gen[enter]" and be cruising without ever leaving the row keys.