diff --git a/app/assets/stylesheets/knowledge_base.scss b/app/assets/stylesheets/knowledge_base.scss
index 618a046e5..532cb4e0d 100644
--- a/app/assets/stylesheets/knowledge_base.scss
+++ b/app/assets/stylesheets/knowledge_base.scss
@@ -251,6 +251,11 @@ b {
     align-items: center;
     justify-content: space-between;
   }
+
+  .menu {
+    justify-content: flex-end;
+    margin-right: -1em;
+  }
 }
 
 .logo {
@@ -276,7 +281,7 @@ b {
   -webkit-tap-highlight-color: rgba(0,0,0,0);
   display: flex;
   align-items: center;
-  margin-right: -1em;
+  flex-wrap: wrap;
   font-size: 14px;
 
   &-item {
@@ -1012,6 +1017,10 @@ b {
     align-items: center;
     justify-content: space-between;
   }
+
+  .menu {
+    justify-content: center;
+  }
 }
 
 .language-picker {
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index f3c66b427..8f7d401bb 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2633,6 +2633,7 @@ input.has-error {
 
   &-container {
     display: flex;
+    flex-wrap: wrap;
     justify-content: flex-end;
     border: 1px solid hsl(213,14%,91%);