diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 52a215cdc..b59e1344d 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -774,6 +774,7 @@ define([
             this._setDefaults();
 
             var checkDocumentClick = function(e) {
+                if (me._skipCheckDocumentClick) return;
                 if ($(e.target).closest('.filter-dlg').length<=0)
                     me.close();
             };
@@ -1160,7 +1161,7 @@ define([
 
             this.miClear.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None);
             this.miReapply.setDisabled(this.initialFilterType === Asc.c_oAscAutoFilterTypes.None);
-            this.btnOk.setDisabled(isCustomFilter);
+            this.btnOk.setDisabled(this.initialFilterType !== Asc.c_oAscAutoFilterTypes.Filters && this.initialFilterType !== Asc.c_oAscAutoFilterTypes.None);
         },
 
         setupDataCells: function() {
@@ -1248,7 +1249,7 @@ define([
                 this.cells.at(0).set('check', !haveUnselectedCell);
                 this.checkCellTrigerBlock = undefined;
             }
-
+            this.btnOk.setDisabled(this.cells.length<1);
             this.cellsList.scroller.update({minScrollbarLength  : 40, alwaysVisibleY: true, suppressScrollX: true});
         },
 
@@ -1268,9 +1269,11 @@ define([
             }
 
             if (!isValid) {
+                me._skipCheckDocumentClick = true;
                 Common.UI.warning({title: this.textWarning,
                     msg: this.warnNoSelected,
                     callback: function() {
+                        me._skipCheckDocumentClick = false;
                         _.delay(function () {
                             me.input.$el.find('input').focus();
                         }, 100, this);
@@ -1308,7 +1311,10 @@ define([
                     });
                     isValid = true;
                 }
-                if (isValid) this.api.asc_applyAutoFilter(this.configTo);
+                if (isValid) {
+                    this.configTo.asc_getFilterObj().asc_setType(Asc.c_oAscAutoFilterTypes.Filters);
+                    this.api.asc_applyAutoFilter(this.configTo);
+                }
             }
         },