diff --git a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
index e38ccb6866ab6..ebebf49c5213f 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
+++ b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
@@ -18,6 +18,32 @@ exports[`Form should not render no settings message when instructed not to 1`] =
                 General
               </h2>
             </EuiFlexItem>
+            <EuiFlexItem
+              grow={false}
+            >
+              <em>
+                <FormattedMessage
+                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                  id="advancedSettings.form.searchResultText"
+                  values={
+                    Object {
+                      "clearSearch": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <em>
+                          <FormattedMessage
+                            defaultMessage="(clear search)"
+                            id="advancedSettings.form.clearSearchResultText"
+                            values={Object {}}
+                          />
+                        </em>
+                      </EuiLink>,
+                      "settingsCount": -1,
+                    }
+                  }
+                />
+              </em>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiText>
         <EuiSpacer
@@ -75,6 +101,34 @@ exports[`Form should not render no settings message when instructed not to 1`] =
           }
           toasts={Object {}}
         />
+        <Field
+          clearChange={[Function]}
+          dockLinks={Object {}}
+          enableSaving={true}
+          handleChange={[Function]}
+          key="general:test:array"
+          setting={
+            Object {
+              "ariaName": "array test",
+              "category": Array [
+                "general",
+              ],
+              "defVal": Array [
+                "test",
+              ],
+              "description": "array foo",
+              "displayName": "Test array setting",
+              "isCustom": false,
+              "isOverridden": false,
+              "name": "general:test:array",
+              "readOnly": false,
+              "requiresPageReload": false,
+              "type": "array",
+              "value": "value",
+            }
+          }
+          toasts={Object {}}
+        />
       </EuiForm>
     </EuiPanel>
     <EuiSpacer
@@ -230,6 +284,32 @@ exports[`Form should render no settings message when there are no settings 1`] =
                 General
               </h2>
             </EuiFlexItem>
+            <EuiFlexItem
+              grow={false}
+            >
+              <em>
+                <FormattedMessage
+                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                  id="advancedSettings.form.searchResultText"
+                  values={
+                    Object {
+                      "clearSearch": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <em>
+                          <FormattedMessage
+                            defaultMessage="(clear search)"
+                            id="advancedSettings.form.clearSearchResultText"
+                            values={Object {}}
+                          />
+                        </em>
+                      </EuiLink>,
+                      "settingsCount": -1,
+                    }
+                  }
+                />
+              </em>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiText>
         <EuiSpacer
@@ -287,6 +367,34 @@ exports[`Form should render no settings message when there are no settings 1`] =
           }
           toasts={Object {}}
         />
+        <Field
+          clearChange={[Function]}
+          dockLinks={Object {}}
+          enableSaving={true}
+          handleChange={[Function]}
+          key="general:test:array"
+          setting={
+            Object {
+              "ariaName": "array test",
+              "category": Array [
+                "general",
+              ],
+              "defVal": Array [
+                "test",
+              ],
+              "description": "array foo",
+              "displayName": "Test array setting",
+              "isCustom": false,
+              "isOverridden": false,
+              "name": "general:test:array",
+              "readOnly": false,
+              "requiresPageReload": false,
+              "type": "array",
+              "value": "value",
+            }
+          }
+          toasts={Object {}}
+        />
       </EuiForm>
     </EuiPanel>
     <EuiSpacer
@@ -442,6 +550,32 @@ exports[`Form should render normally 1`] = `
                 General
               </h2>
             </EuiFlexItem>
+            <EuiFlexItem
+              grow={false}
+            >
+              <em>
+                <FormattedMessage
+                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                  id="advancedSettings.form.searchResultText"
+                  values={
+                    Object {
+                      "clearSearch": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <em>
+                          <FormattedMessage
+                            defaultMessage="(clear search)"
+                            id="advancedSettings.form.clearSearchResultText"
+                            values={Object {}}
+                          />
+                        </em>
+                      </EuiLink>,
+                      "settingsCount": -1,
+                    }
+                  }
+                />
+              </em>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiText>
         <EuiSpacer
@@ -499,6 +633,34 @@ exports[`Form should render normally 1`] = `
           }
           toasts={Object {}}
         />
+        <Field
+          clearChange={[Function]}
+          dockLinks={Object {}}
+          enableSaving={true}
+          handleChange={[Function]}
+          key="general:test:array"
+          setting={
+            Object {
+              "ariaName": "array test",
+              "category": Array [
+                "general",
+              ],
+              "defVal": Array [
+                "test",
+              ],
+              "description": "array foo",
+              "displayName": "Test array setting",
+              "isCustom": false,
+              "isOverridden": false,
+              "name": "general:test:array",
+              "readOnly": false,
+              "requiresPageReload": false,
+              "type": "array",
+              "value": "value",
+            }
+          }
+          toasts={Object {}}
+        />
       </EuiForm>
     </EuiPanel>
     <EuiSpacer
@@ -654,6 +816,32 @@ exports[`Form should render read-only when saving is disabled 1`] = `
                 General
               </h2>
             </EuiFlexItem>
+            <EuiFlexItem
+              grow={false}
+            >
+              <em>
+                <FormattedMessage
+                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                  id="advancedSettings.form.searchResultText"
+                  values={
+                    Object {
+                      "clearSearch": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <em>
+                          <FormattedMessage
+                            defaultMessage="(clear search)"
+                            id="advancedSettings.form.clearSearchResultText"
+                            values={Object {}}
+                          />
+                        </em>
+                      </EuiLink>,
+                      "settingsCount": -1,
+                    }
+                  }
+                />
+              </em>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiText>
         <EuiSpacer
@@ -711,6 +899,34 @@ exports[`Form should render read-only when saving is disabled 1`] = `
           }
           toasts={Object {}}
         />
+        <Field
+          clearChange={[Function]}
+          dockLinks={Object {}}
+          enableSaving={false}
+          handleChange={[Function]}
+          key="general:test:array"
+          setting={
+            Object {
+              "ariaName": "array test",
+              "category": Array [
+                "general",
+              ],
+              "defVal": Array [
+                "test",
+              ],
+              "description": "array foo",
+              "displayName": "Test array setting",
+              "isCustom": false,
+              "isOverridden": false,
+              "name": "general:test:array",
+              "readOnly": false,
+              "requiresPageReload": false,
+              "type": "array",
+              "value": "value",
+            }
+          }
+          toasts={Object {}}
+        />
       </EuiForm>
     </EuiPanel>
     <EuiSpacer
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
index e42432d0bc319..a691af4a22bef 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx
@@ -91,6 +91,16 @@ const settings = {
       description: 'foo',
       category: ['general'],
     },
+    {
+      ...defaults,
+      name: 'general:test:array',
+      ariaName: 'array test',
+      displayName: 'Test array setting',
+      description: 'array foo',
+      type: 'array' as UiSettingsType,
+      category: ['general'],
+      defVal: ['test'],
+    },
   ],
   'x-pack': [
     {
@@ -256,4 +266,60 @@ describe('Form', () => {
       })
     );
   });
+
+  it('should save an array typed field when user provides an empty string correctly', async () => {
+    const wrapper = mountWithI18nProvider(
+      <Form
+        settings={settings}
+        visibleSettings={settings}
+        categories={categories}
+        categoryCounts={categoryCounts}
+        save={save}
+        clearQuery={clearQuery}
+        showNoResultsMessage={true}
+        enableSaving={false}
+        toasts={{} as any}
+        dockLinks={{} as any}
+      />
+    );
+
+    (wrapper.instance() as Form).setState({
+      unsavedChanges: {
+        'general:test:array': {
+          value: '',
+        },
+      },
+    });
+
+    findTestSubject(wrapper.update(), `advancedSetting-saveButton`).simulate('click');
+    expect(save).toHaveBeenCalledWith({ 'general:test:array': [] });
+  });
+
+  it('should save an array typed field when user provides a comma separated string correctly', async () => {
+    const wrapper = mountWithI18nProvider(
+      <Form
+        settings={settings}
+        visibleSettings={settings}
+        categories={categories}
+        categoryCounts={categoryCounts}
+        save={save}
+        clearQuery={clearQuery}
+        showNoResultsMessage={true}
+        enableSaving={false}
+        toasts={{} as any}
+        dockLinks={{} as any}
+      />
+    );
+
+    (wrapper.instance() as Form).setState({
+      unsavedChanges: {
+        'general:test:array': {
+          value: 'test1, test2',
+        },
+      },
+    });
+
+    findTestSubject(wrapper.update(), `advancedSetting-saveButton`).simulate('click');
+    expect(save).toHaveBeenCalledWith({ 'general:test:array': ['test1', 'test2'] });
+  });
 });