diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index b8e776b..56c2db4 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -4483,11 +4483,13 @@
 }
 @media -moz-pref("userChrome.padding.urlView_expanding") or -moz-pref("userChrome.urlView.as_commandbar") {
   #urlbar[breakout][breakout-extend] {
-    top: calc((var(--urlbar-toolbar-height, var(--urlbar-container-height)) - var(--urlbar-height)) / 2) !important;
-    left: 0 !important;
-    width: 100% !important;
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
   }
-  #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container {
     height: var(--urlbar-height) !important;
     padding-block: 0 !important;
     padding-inline: var(--urlbar-container-padding, 0px) !important;
@@ -18808,11 +18810,13 @@
 }
 @media (-moz-bool-pref: "userChrome.padding.urlView_expanding"), (-moz-bool-pref: "userChrome.urlView.as_commandbar") {
   #urlbar[breakout][breakout-extend] {
-    top: calc((var(--urlbar-toolbar-height, var(--urlbar-container-height)) - var(--urlbar-height)) / 2) !important;
-    left: 0 !important;
-    width: 100% !important;
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
   }
-  #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container {
     height: var(--urlbar-height) !important;
     padding-block: 0 !important;
     padding-inline: var(--urlbar-container-padding, 0px) !important;
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index c8e0940..8bd726e 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -4828,11 +4828,13 @@
 }
 @supports -moz-bool-pref("userChrome.padding.urlView_expanding") or -moz-bool-pref("userChrome.urlView.as_commandbar") {
   #urlbar[breakout][breakout-extend] {
-    top: calc((var(--urlbar-toolbar-height, var(--urlbar-container-height)) - var(--urlbar-height)) / 2) !important;
-    left: 0 !important;
-    width: 100% !important;
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
   }
-  #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container {
     height: var(--urlbar-height) !important;
     padding-block: 0 !important;
     padding-inline: var(--urlbar-container-padding, 0px) !important;
diff --git a/src/padding/_index.scss b/src/padding/_index.scss
index 5f13bfa..32328f1 100644
--- a/src/padding/_index.scss
+++ b/src/padding/_index.scss
@@ -51,12 +51,14 @@
 }
 @include Option("userChrome.padding.urlView_expanding", "userChrome.urlView.as_commandbar") {
   #urlbar[breakout][breakout-extend] {
-    top: calc((var(--urlbar-toolbar-height, var(--urlbar-container-height)) - var(--urlbar-height)) / 2) !important;
-    left: 0 !important;
-    width: 100% !important;
+    top: calc(var(--urlbar-container-height) * 2 - var(--urlbar-height)) !important;
+    width: var(--urlbar-width) !important;
+    position: relative !important;
+    margin: 0 !important;
   }
 
-  #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+  #urlbar[breakout][breakout-extend] > #urlbar-input-container,
+  #urlbar[breakout][breakout-extend] > .urlbar-input-container  {
     height: var(--urlbar-height) !important;
     padding-block: 0 !important;
     padding-inline: var(--urlbar-container-padding, 0px) !important;