diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index c60233ae89..defd1f65ee 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -290,8 +290,9 @@
         }
     }
 
-    .search-help-popover.visible {
-        visibility: hidden;
+    .search-help-popover {
+        left: 55px;
+        max-width: calc(100% - 10px);
     }
 
     .modal-direct-channels {
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index bb3d786525..a74c186609 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -26,6 +26,7 @@
 
             .search-bar__container {
                 padding-right: 8px;
+                z-index: 5;
             }
         }
     }