diff --git a/chrome/urlbar_container_color_border.css b/chrome/urlbar_container_color_border.css
index 6eda0a7..62bd523 100644
--- a/chrome/urlbar_container_color_border.css
+++ b/chrome/urlbar_container_color_border.css
@@ -3,7 +3,7 @@ See the above repository for updates as well as full license text. */
 
 /* Draws a border around urlbar using the color of the current container. */
 
-#urlbar:not([open]) > #urlbar-input-container{
+.urlbar-input-container{
   border-width: 0 !important;
   padding: 2px !important;
 }
@@ -28,8 +28,11 @@ See the above repository for updates as well as full license text. */
   outline-offset: -2px
 }
 
-/* These might potentially cause some issues, but are needed to make the border extend the border to the full popup when urlabar popup is open */
-#urlbar[open] > #urlbar-input-container{ position: static !important; }
+/* These might potentially cause some issues, but are needed to make the border extend the border to the full popup when urlbar popup is open */
+#urlbar[open] > .urlbar-input-container{
+  position: static !important;
+  padding: calc(2px + var(--urlbar-margin-inline,5px)) !important;
+}
 #urlbar[open] > #urlbar-background{ z-index: -1 !important; }
 
 /* OPTIONAL FEATURES */