diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index 739f882910..277344a2e6 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -26,6 +26,7 @@
 		"CallUtils": {"props": ["getCalls", "isCallActive"]},
 		"CategoryCollapseStore": {"props": ["getCollapsedCategories", "isCollapsed"]},
 		"CategoryCollapseUtils": {"props": ["categoryCollapse", "categoryCollapseAll"]},
+		"ChannelUtils": {"props": ["selectChannel", "selectPrivateChannel"]},
 		"ChannelStore": {"props": ["getChannel", "getDMFromUserId"]},
 		"ColorUtils": {"props": ["hex2int", "hex2rgb"]},
 		"ContextMenuUtils": {"props": ["closeContextMenu", "openContextMenu"]},
@@ -51,7 +52,7 @@
 		"GuildSettingsUtils": {"props": ["open", "updateGuild"]},
 		"GuildStore": {"props": ["getGuild", "getGuilds"]},
 		"GuildUnavailableStore": {"props": ["isUnavailable", "totalUnavailableGuilds"]},
-		"GuildUtils": {"props": ["transitionToGuildSync"]},
+		"GuildUtils": {"props": ["selectGuild", "transitionToGuildSync"]},
 		"GuildWelcomeStore": {"props": ["hasSeen", "get"]},
 		"GuildWelcomeUtils": {"props": ["welcomeScreenViewed", "resetWelcomeScreen"]},
 		"HistoryUtils": {"props": ["transitionTo", "replaceWith", "getHistory"]},
@@ -91,7 +92,6 @@
 		"ReactionUtils": {"props": ["addReaction", "removeReaction"]},
 		"RecentMentionUtils": {"props": ["deleteRecentMention", "fetchRecentMentions"]},
 		"SearchPageUtils": {"props": ["searchNextPage", "searchPreviousPage"]},
-		"SelectChannelUtils": {"props": ["selectChannel", "selectPrivateChannel"]},
 		"SettingsUtils": {"props": ["updateRemoteSettings", "updateLocalSettings"]},
 		"SimpleMarkdownParser": {"props": ["parseBlock", "parseInline", "defaultOutput"]},
 		"SlateUtils": {"props": ["serialize", "deserialize"], "notProps": ["getFlag"]},
diff --git a/Plugins/PersonalPins/PersonalPins.plugin.js b/Plugins/PersonalPins/PersonalPins.plugin.js
index 862ef23def..f28125e4cc 100644
--- a/Plugins/PersonalPins/PersonalPins.plugin.js
+++ b/Plugins/PersonalPins/PersonalPins.plugin.js
@@ -440,7 +440,8 @@ module.exports = (_ => {
 							tag: "span",
 							className: BDFDB.disCN.messagespopoutchannelname,
 							onClick: _ => {
-								BDFDB.LibraryModules.SelectChannelUtils.selectChannel(channel.guild_id, channel.id);
+								BDFDB.LibraryModules.GuildUtils.selectGuild(channel.guild_id);
+								BDFDB.LibraryModules.ChannelUtils.selectChannel(channel.guild_id, channel.id);
 							},
 							children: channelName ? ((channel.guild_id ? "#" : "@") + channelName) : "???"
 						}),
@@ -467,7 +468,8 @@ module.exports = (_ => {
 								BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Clickable, {
 									className: BDFDB.disCN.messagespopoutjumpbutton,
 									onClick: _ => {
-										BDFDB.LibraryModules.SelectChannelUtils.selectChannel(channel.guild_id, channel.id, message.id);
+										BDFDB.LibraryModules.GuildUtils.selectGuild(channel.guild_id);
+										BDFDB.LibraryModules.ChannelUtils.selectChannel(channel.guild_id, channel.id, message.id);
 									},
 									children: BDFDB.ReactUtils.createElement("div", {
 										children: BDFDB.LanguageUtils.LanguageStrings.JUMP