Fix ChannelContextMenu