diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss
index 2d5a0b22e7931..223e1deb2eeca 100644
--- a/administrator/templates/atum/scss/blocks/_toolbar.scss
+++ b/administrator/templates/atum/scss/blocks/_toolbar.scss
@@ -375,8 +375,7 @@ joomla-toolbar-button {
             width:100%;
         }
      }
-     .ordering-select,
-     .js-stools-container-selector {
+     .ordering-select {
         margin-right:.5rem;
         @include media-breakpoint-down(sm) {
           [dir=rtl] & {
diff --git a/administrator/templates/atum/scss/system/searchtools/searchtools.scss b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
index 6f9d9d0c444e7..798a988bef83c 100644
--- a/administrator/templates/atum/scss/system/searchtools/searchtools.scss
+++ b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
@@ -106,6 +106,40 @@
       margin-left: 0.5rem;
       margin-right: 0;
     }
+
+    @include media-breakpoint-down(sm) {
+      float: none !important;
+      width: 100%;
+      margin-right: 0;
+    }
+
+    @include media-breakpoint-down(xs) {
+      [dir=ltr] & {
+        margin-right: 0;
+      }
+
+      [dir=rtl] & {
+        margin-left: 0;
+      }
+    }
+
+    .js-stools-field-selector {
+      @include media-breakpoint-down(sm) {
+        margin-right: 0;
+
+        [dir=rtl] & {
+          margin-right: 0;
+        }
+      }
+
+      @include media-breakpoint-down(xs) {
+        margin-right: .5rem;
+
+        [dir=rtl] & {
+          margin-left: 0;
+        }
+      }
+    }
   }
 
   .js-stools-container-selector-first {
@@ -116,21 +150,21 @@
     [dir=rtl] & {
       margin-left: 0.5rem;
     }
-  }
-
-  .js-stools-container-selector,
-  .js-stools-container-selector-first {
 
     @include media-breakpoint-down(sm) {
       float: none !important;
       width: 100%;
+      margin-right: 0;
+    }
 
+    @include media-breakpoint-down(xs) {
       [dir=ltr] & {
         margin-right: 0;
       }
 
       [dir=rtl] & {
-        margin-right: 0;
+        //margin-right: 0;
+        margin-left: 0;
       }
     }
 
@@ -143,6 +177,14 @@
           margin-right: 0;
         }
       }
+
+      @include media-breakpoint-down(xs) {
+        margin-right: .5rem;
+
+        [dir=rtl] & {
+          margin-right: 0;
+        }
+      }
     }
   }