diff --git a/cms/static/cms/sass/components/_toolbar.scss b/cms/static/cms/sass/components/_toolbar.scss
index c397af0d63..996b23ab2d 100644
--- a/cms/static/cms/sass/components/_toolbar.scss
+++ b/cms/static/cms/sass/components/_toolbar.scss
@@ -56,7 +56,7 @@
     // items
     .cms-toolbar-item {
         float: left;
-        [dir="rtl"] & {
+        [dir=rtl] & {
             float: right;
         }
     }
@@ -237,6 +237,12 @@
 
     .cms-toolbar-item {
         float: none;
+        [dir=rtl] & {
+            // a bit weird, but if removed, it will best match
+            // with [dir="rtl"] div.cms .cms-toolbar .cms-toolbar-item
+            // and will float to the right
+            float: none;
+        }
         margin: $toolbar-menu-item-padding !important;
         overflow: hidden;
         margin-top: 5px;