diff --git a/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss b/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
index a7f91f980d79..3a7fe796def4 100644
--- a/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
+++ b/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
@@ -18,8 +18,7 @@
 
 .headerAppActionMenu .globalQueryBar,
 .headerAppActionMenu .globalDatePicker {
-  // The left-padding is a magic number just to add some space to the left that reduces with screen width
-  padding: 0 0 0 calc(100vw - 1600px);
+  padding: 0;
 }
 
 .globalFilterGroup__filterBar {
diff --git a/src/plugins/navigation/public/top_nav_menu/_index.scss b/src/plugins/navigation/public/top_nav_menu/_index.scss
index b8b2b7646eb3..8df868a7c27d 100644
--- a/src/plugins/navigation/public/top_nav_menu/_index.scss
+++ b/src/plugins/navigation/public/top_nav_menu/_index.scss
@@ -70,9 +70,12 @@
   .euiText {
     line-height: $euiFormControlCompressedHeight;
     white-space: nowrap;
-    max-width: 18ch;
     overflow: hidden;
     text-overflow: ellipsis;
+
+    @media only screen and (max-width: map-get($euiBreakpoints, "xxl")) {
+      max-width: 18ch;
+    }
   }
 }