diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 6031910c35..63923e9044 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -1473,7 +1473,7 @@ define([
                                         '<input id="afcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
                                         '<label for="afcheckbox-<%= id %>" class="checkbox__shape"></label>',
                                     '</label>',
-                                    '<div id="<%= id %>" style="pointer-events:none; margin-left: 20px;display: flex;">',
+                                    '<div id="<%= id %>" class="tree-label" style="pointer-events:none; margin-left: 20px;display: flex;">',
                                         '<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(dateValue) %></div>',
                                     '</div>',
                                 '</div>',
@@ -1485,7 +1485,7 @@ define([
                                         '<input id="afcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
                                         '<label for="afcheckbox-<%= id %>" class="checkbox__shape"></label>',
                                     '</label>',
-                                    '<div id="<%= id %>" style="pointer-events:none; margin-left: 20px;display: flex;">',
+                                    '<div id="<%= id %>" class="tree-label" style="pointer-events:none; margin-left: 20px;display: flex;">',
                                         '<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(value) %></div>',
                                         '<% if (typeof count !=="undefined" && count) { %>',
                                             '<div style="word-break: normal; margin-left: 10px; color: #afafaf;"><%= count%></div>',
@@ -1840,7 +1840,7 @@ define([
 
             var event = window.event ? window.event : window._event;
             if (event) {
-                target = $(event.currentTarget).find('.list-item');
+                target = $(event.currentTarget).find('.tree-label');
 
                 if (target.length) {
                     bound = target.get(0).getBoundingClientRect();
@@ -2337,6 +2337,8 @@ define([
                 });
             }
 
+            me.cellsList.cmpEl[countYears > 0 ? 'addClass' : 'removeClass']('shifted-right');
+
             if (selectedCells==arr.length) selectAllState = true;
             else if (selectedCells>0) selectAllState = 'indeterminate';
 
diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less
index 3f1531875b..0064d4da12 100644
--- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less
+++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less
@@ -9,6 +9,7 @@
       border: @scaled-one-px-value-ie solid @input-border;
       border: @scaled-one-px-value solid @input-border;
       .item {
+        cursor: pointer;
         &.selected {
           background-color: @highlight-button-hover-ie;
           background-color: @highlight-button-hover;
@@ -21,11 +22,18 @@
         }
         .tree-item {
           word-break: break-all;
-          min-height: 26px;
-          padding: 0 6px;
+          min-height: 22px;
+          padding: 0 0 0 6px;
           &.date {
             padding: 0 12px 0 24px;
           }
+          .name {
+            padding: 3px 0;
+          }
+          .tree-caret {
+            width: 22px;
+            height: 22px;
+          }
         }
       }
     }
@@ -33,6 +41,18 @@
     .item {
       padding-right: 12px;
     }
+
+    &.shifted-right {
+      .treeview .item {
+        .tree-item {
+          padding-left: 24px;
+          .rtl & {
+            padding-left: 0;
+            padding-right: 24px;
+          }
+        }
+      }
+    }
   }
 
   .body {