diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css
index c2661cac63..d464c9afdc 100644
--- a/Themes/BasicBackground/BasicBackground.css
+++ b/Themes/BasicBackground/BasicBackground.css
@@ -7417,8 +7417,9 @@ html .channelTabs-tabContainer,
 html .channelTabs-favContainer {
 	display: flex;
 	align-items: center;
-	min-height: unset;
-	height: 28px;
+	flex-wrap: wrap;
+	min-height: 28px;
+	height: unset;
 	overflow: hidden;
 	transition: height 0.3s linear;
 }
@@ -7432,9 +7433,9 @@ html .channelTabs-favContainer {
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
-html .channelTabs-favContainer:empty {
-	height: 0;
-	padding: 0;
+html .channelTabs-noFavs {
+	background: transparent;
+	padding: 0 6px;
 }
 
 html .channelTabs-tab,
diff --git a/Themes/DiscordRecolor/DiscordRecolor.css b/Themes/DiscordRecolor/DiscordRecolor.css
index 4f7796bb91..4db5d9c6b7 100644
--- a/Themes/DiscordRecolor/DiscordRecolor.css
+++ b/Themes/DiscordRecolor/DiscordRecolor.css
@@ -4025,13 +4025,15 @@ html .channelTabs-tabContainer,
 html .channelTabs-favContainer {
 	display: flex;
 	align-items: center;
-	min-height: unset;
-	height: 28px;
+	flex-wrap: wrap;
+	min-height: 28px;
+	height: unset;
 	overflow: hidden;
 	transition: height 0.3s linear;
 }
 html .channelTabs-tabContainer {
 	background-color: var(--background-secondary-alt);
+	border-bottom: 3px solid var(--background-tertiary);
 	padding-top: 6px;
 	padding-left: 4px;
 }
@@ -4041,9 +4043,9 @@ html .channelTabs-favContainer {
 	padding-bottom: 3px;
 	padding-left: 2px;
 }
-html .channelTabs-favContainer:empty {
-	height: 0;
-	padding: 0;
+html .channelTabs-noFavs {
+	background: transparent;
+	padding: 0 6px;
 }
 
 html .channelTabs-tab,