diff --git a/bi/widget.js b/bi/widget.js
index 99ffd64b57..979eb78080 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -10782,7 +10782,11 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
         ob || (ob = {});
         ob.value || (ob.value = []);
         if (ob.type === BI.Selection.All) {
-            this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            if (BI.size(ob.assist) === 1) {
+                this.editor.setState(ob.assist[0] + "");
+            } else {
+                this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            }
         } else {
             if (BI.size(ob.value) === 1) {
                 this.editor.setState(ob.value[0] + "");
diff --git a/docs/widget.js b/docs/widget.js
index 99ffd64b57..979eb78080 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -10782,7 +10782,11 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
         ob || (ob = {});
         ob.value || (ob.value = []);
         if (ob.type === BI.Selection.All) {
-            this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            if (BI.size(ob.assist) === 1) {
+                this.editor.setState(ob.assist[0] + "");
+            } else {
+                this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            }
         } else {
             if (BI.size(ob.value) === 1) {
                 this.editor.setState(ob.value[0] + "");
diff --git a/src/widget/multiselect/trigger/searcher.multiselect.js b/src/widget/multiselect/trigger/searcher.multiselect.js
index 7d65558d2d..a7a724e4a9 100644
--- a/src/widget/multiselect/trigger/searcher.multiselect.js
+++ b/src/widget/multiselect/trigger/searcher.multiselect.js
@@ -102,7 +102,11 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
         ob || (ob = {});
         ob.value || (ob.value = []);
         if (ob.type === BI.Selection.All) {
-            this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            if (BI.size(ob.assist) === 1) {
+                this.editor.setState(ob.assist[0] + "");
+            } else {
+                this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All);
+            }
         } else {
             if (BI.size(ob.value) === 1) {
                 this.editor.setState(ob.value[0] + "");