diff --git a/Plugins/EditServers/EditServers.plugin.js b/Plugins/EditServers/EditServers.plugin.js
index 226089119d..74618cf253 100644
--- a/Plugins/EditServers/EditServers.plugin.js
+++ b/Plugins/EditServers/EditServers.plugin.js
@@ -3,7 +3,7 @@
 class EditServers {
 	getName () {return "EditServers";}
 
-	getVersion () {return "2.0.0";} 
+	getVersion () {return "2.0.1";} 
 
 	getAuthor () {return "DevilBro";}
 
@@ -11,7 +11,7 @@ class EditServers {
 
 	initConstructor () {
 		this.changelog = {
-			"improved":[["Server Banners","Setting a banner no longer fucks around with the VERIFY flag"]]
+			"improved":[["ServerFolders bug","Fixed a bug that prevented tooltips from showing when an edited server is in a folder"]]
 		};
 		
 		this.labels = {};
@@ -577,6 +577,7 @@ class EditServers {
 				BDFDB.createTooltip(data.name || info.name, wrapper, {type,selector:"EditServers-tooltip",style:`color: ${fontColor} !important; background-color: ${bgColor} !important; border-color: ${bgColor} !important;`,css:`body ${BDFDB.dotCN.tooltip}:not(.EditServers-tooltip) {display: none !important;}`});
 			};
 			wrapper.addEventListener("mouseenter", wrapper.tooltipListenerEditServers);
+			if (document.querySelector(BDFDB.dotCN.guildcontainer + ":hover") == wrapper) wrapper.tooltipListenerEditServers();
 		}
 	}
 
diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index 70b651d8a9..4fa001b0cf 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -1258,8 +1258,8 @@ class ServerFolders {
 		BDFDB.addClass(guildcopy, "copy");
 		BDFDB.toggleEles(guildcopy, true);
 		guildcopyinner.addEventListener("mouseenter", () => {
-			let EditServersData = BDFDB.isPluginEnabled("EditServers") ? BDFDB.loadData(info.id, "EditServers", "servers") : null;
-			if (EditServersData) bdplugins.EditServers.plugin.changeTooltip(info, guildcopyinner, "right");
+			let ESdata = BDFDB.isPluginEnabled("EditServers") ? bdplugins.EditServers.plugin.getGuildData(info.id, guildcopyinner) : null;
+			if (ESdata && (ESdata.name || ESdata.color3 || ESdata.color4)) bdplugins.EditServers.plugin.changeTooltip(info, guildcopyinner, "right");
 			else {
 				let folderData = BDFDB.loadData(folderdiv.id, this, "folders") || {};
 				let bgColor = BDFDB.colorCONVERT(folderData.copyTooltipColor ? folderData.color3 : null, "RGB");