diff --git a/devtools/client/themes/netmonitor.css b/devtools/client/themes/netmonitor.css
index 9bd1a7eecbec..ed656a75f3af 100644
--- a/devtools/client/themes/netmonitor.css
+++ b/devtools/client/themes/netmonitor.css
@@ -653,8 +653,6 @@ box.requests-menu-status[code^="5"] {
   transition-property: max-width, -moz-padding-end, -moz-padding-start;
   transition-duration: 250ms;
   transition-timing-function: ease;
-  margin-left: 3px;
-  margin-right: 3px;
 }
 
 #requests-menu-filter-freetext-text:not([focused]):not([filled]) > .textbox-input-box {
diff --git a/devtools/client/themes/toolbars.inc.css b/devtools/client/themes/toolbars.inc.css
index b477dd81b201..3a6723cda662 100644
--- a/devtools/client/themes/toolbars.inc.css
+++ b/devtools/client/themes/toolbars.inc.css
@@ -328,7 +328,7 @@
 .devtools-textinput,
 .devtools-searchinput {
   -moz-appearance: none;
-  margin: 1px 0;
+  margin: 1px 3px;
   border: 1px solid;
 %ifdef XP_MACOSX
   border-radius: 20px;
@@ -370,6 +370,14 @@
   display: flex;
   flex: 1;
   position: relative;
+  padding: 0 3px;
+}
+
+/* The spacing is accomplished with a padding on the searchbox */
+.devtools-searchbox > .devtools-textinput,
+.devtools-searchbox > .devtools-searchinput {
+  margin-left: 0;
+  margin-right: 0;
 }
 
 .devtools-rule-searchbox {