diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index 23ddd5e7..1ca04602 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -40,7 +40,7 @@ toolbarspring {
 }
 
 #urlbar[breakout][breakout-extend] {
-	width: 100% !important;
+	width: var(--urlbar-width) !important;
 	z-index: 5 !important;
 	padding: 0 !important;
 	border-radius: 8px !important;
diff --git a/src/other/firefox/common/parts/csd.css b/src/other/firefox/common/parts/csd.css
index 3d2311c5..674f864e 100644
--- a/src/other/firefox/common/parts/csd.css
+++ b/src/other/firefox/common/parts/csd.css
@@ -135,7 +135,8 @@
 	}
 
 	/* Window buttons box */
-	:root[tabsintitlebar] #nav-bar .titlebar-buttonbox-container {
+	:root[tabsintitlebar] #nav-bar .titlebar-buttonbox-container,
+	:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container {
 		padding: 0 3px 0 4px;
 		left: 8px;
 		right: auto;