diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index 4fa001b0cf..050e866148 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -471,6 +471,7 @@ class ServerFolders {
 	stop () {
 		if (global.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) {
 			this.resetAllElements();
+			BDFDB.removeClasses("foldercontentopened");
 			BDFDB.removeEles(this.foldercontent, BDFDB.dotCN.guildswrapper + ".foldercontent", ".serverfolder-contextmenu");
 			BDFDB.unloadMessage(this);
 		}
@@ -1163,6 +1164,7 @@ class ServerFolders {
 		forceOpenClose = forceOpenClose === undefined ? BDFDB.containsClass(this.foldercontent, "foldercontentclosed") : forceOpenClose;
 		BDFDB.toggleClass(this.foldercontent, "foldercontentopen", forceOpenClose);
 		BDFDB.toggleClass(this.foldercontent, "foldercontentclosed", !forceOpenClose);
+		BDFDB.toggleClass(document.body, "foldercontentopened", forceOpenClose);
 	}
 
 	openCloseFolder (folderdiv) {
diff --git a/Plugins/ThemeRepo/ThemeRepo.plugin.js b/Plugins/ThemeRepo/ThemeRepo.plugin.js
index 7e2b02fec2..b05183cc9e 100644
--- a/Plugins/ThemeRepo/ThemeRepo.plugin.js
+++ b/Plugins/ThemeRepo/ThemeRepo.plugin.js
@@ -491,7 +491,11 @@ class ThemeRepo {
 						var avatar = BDFDB.getUserAvatar();
 						var nativecss = document.querySelector("head link[rel='stylesheet'][integrity]");
 						nativecss = nativecss && nativecss.href ? nativecss.href : null;
-						frame.contentWindow.postMessage({origin:"ThemeRepo",reason:"OnLoad",username,id,discriminator,avatar,nativecss},"*");
+						var app = document.querySelector(BDFDB.dotCN.app);
+						app = app ? app.className : null;
+						var titlebar = document.querySelector(BDFDB.dotCN.titlebar);
+						titlebar = titlebar ? titlebar.outerHTML : null;
+						frame.contentWindow.postMessage({origin:"ThemeRepo",reason:"OnLoad",username,id,discriminator,avatar,nativecss,app,titlebar},"*");
 						frame.contentWindow.postMessage({origin:"ThemeRepo",reason:"DarkLight",checked:darklightinput.checked,light:BDFDB.disCN.themelight,dark:BDFDB.disCN.themedark},"*");
 						frame.contentWindow.postMessage({origin:"ThemeRepo",reason:"Normalize",checked:normalizeinput.checked},"*");
 						break;
diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css
index 3cc0bf9e3b..c05dad19bf 100644
--- a/Themes/BasicBackground/BasicBackground.css
+++ b/Themes/BasicBackground/BasicBackground.css
@@ -624,6 +624,13 @@ input:disabled {
 .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
 	width: 72px;
 }
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP,
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
+	width: 144px;
+}
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
+	padding-right: 82px;
+}
 .titleBar-AC4pGV.typeMacOS-3EmCyP.typeMacOSWithFrame-3R_i5S .macButtons-2MuSAC {
 	margin-top: 0;
 	margin-right: 0;
diff --git a/Themes/ServerColumns/ServerColumns.css b/Themes/ServerColumns/ServerColumns.css
index 760b9a4ae1..677a5a9a12 100644
--- a/Themes/ServerColumns/ServerColumns.css
+++ b/Themes/ServerColumns/ServerColumns.css
@@ -18,6 +18,13 @@
 .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
 	padding-right: calc(1px * ((var(--vguildsize) + 10) * var(--vcolumns) - 50)) !important;
 }
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP,
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
+	width: calc(2px * ((var(--vguildsize) + 10) * var(--vcolumns) + 35 - 25)) !important;
+}
+body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
+	padding-right: calc(1px * ((var(--vguildsize) + 10) * var(--vcolumns) * 2 - 40)) !important;
+}
 .titleBar-AC4pGV.typeMacOS-3EmCyP.typeMacOSWithFrame-3R_i5S .macButtons-2MuSAC {
 	margin-top: 0 !important;
 	margin-right: 0 !important;