diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js
index 04416777..c7dca1b6 100644
--- a/src/store/modules/normalizers.js
+++ b/src/store/modules/normalizers.js
@@ -271,19 +271,21 @@ const wrapValues = (settings, currentState) => {
 export const formSearchObject = description => {
   const parseNestedSettings = (description, label, key) => description.reduce((acc, setting) => {
     const searchArray = _.compact([setting.key, setting.label, setting.description]).map(el => el.toLowerCase())
+    const resultObject = { label: setting.label, key: setting.key || setting.group, groupKey: key, groupLabel: label, search: searchArray }
     if (setting.children) {
-      const updatedAcc = [...acc, { label: setting.label, key: setting.key, groupKey: key, groupLabel: label, search: searchArray }]
-      return [...updatedAcc, ...parseNestedSettings(setting.children, setting.label, setting.key)]
+      const updatedAcc = [...acc, resultObject]
+      return [...updatedAcc, ...parseNestedSettings(setting.children, label, key)]
     }
-    return [...acc, { label: setting.label, key: setting.key, groupKey: key, groupLabel: label, search: searchArray }]
+    return [...acc, resultObject]
   }, [])
 
   return description.reduce((acc, setting) => {
     const searchArray = _.compact([setting.key, setting.label, setting.description]).map(el => el.toLowerCase())
+    const resultObject = { label: setting.label, key: setting.key || setting.group, groupKey: setting.key || setting.group, groupLabel: setting.label, search: searchArray }
     if (setting.children) {
-      const updatedAcc = [...acc, { label: setting.label, key: setting.key, groupKey: setting.key, groupLabel: setting.label, search: searchArray }]
-      return [...updatedAcc, ...parseNestedSettings(setting.children, setting.label, setting.key)]
+      const updatedAcc = [...acc, resultObject]
+      return [...updatedAcc, ...parseNestedSettings(setting.children, setting.label, setting.key || setting.group)]
     }
-    return [...acc, { label: setting.label, key: setting.key, groupKey: setting.key, groupLabel: setting.label, search: searchArray }]
+    return [...acc, resultObject]
   }, [])
 }
diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index 615aa126..981270cf 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -5,7 +5,7 @@
         :label-width="customLabelWidth"
         :class="labelClass"
         :style="`margin-left:${margin}px;margin-bottom:0`"
-        :data-search="setting.key">
+        :data-search="setting.key || setting.group">
         <span slot="label">
           {{ setting.label }}
           <el-tooltip v-if="canBeDeleted && isDesktop" :content="$t('settings.removeFromDB')" placement="bottom-end">
@@ -37,13 +37,13 @@
           v-if="setting.type === 'string' || (setting.type.includes('string') && setting.type.includes('atom'))"
           :value="inputValue"
           :placeholder="setting.suggestions ? setting.suggestions[0] : null"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           class="input"
           @input="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
         <el-switch
           v-if="setting.type === 'boolean'"
           :value="inputValue"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           class="switch-input"
           @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
         <el-input-number
@@ -52,12 +52,12 @@
           :placeholder="setting.suggestions ? setting.suggestions[0].toString() : null"
           :min="0"
           :size="isDesktop ? 'large' : 'medium'"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
         <el-select
           v-if="setting.type === 'module' || (setting.type.includes('atom') && setting.type.includes('dropdown'))"
           :value="inputValue === false ? 'false' : inputValue"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           clearable
           class="input"
           @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)">
@@ -69,7 +69,7 @@
         <el-select
           v-if="renderMultipleSelect(setting.type)"
           :value="setting.key === ':rewrite_policy' ? rewritePolicyValue : inputValue"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           multiple
           filterable
           allow-create
@@ -80,7 +80,7 @@
         <el-input
           v-if="setting.key === ':ip'"
           :value="inputValue"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           placeholder="xxx.xxx.xxx.xx"
           class="input"
           @input="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
@@ -88,7 +88,7 @@
           v-if="setting.type === 'atom'"
           :value="inputValue"
           :placeholder="setting.suggestions[0] ? setting.suggestions[0].substr(1) : ''"
-          :data-search="setting.key"
+          :data-search="setting.key || setting.group"
           class="input"
           @input="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)">
           <template slot="prepend">:</template>
diff --git a/src/views/settings/components/Setting.vue b/src/views/settings/components/Setting.vue
index d676da29..9794cc63 100644
--- a/src/views/settings/components/Setting.vue
+++ b/src/views/settings/components/Setting.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="!loading">
-    <el-form-item v-if="settingGroup.description" class="description-container">
+    <el-form-item v-if="settingGroup.description" :data-search="settingGroup.key || settingGroup.group" class="description-container">
       <span class="description" v-html="getFormattedDescription(settingGroup.description)"/>
     </el-form-item>
     <div v-if="settingGroup.key === 'Pleroma.Emails.Mailer'">
@@ -39,7 +39,7 @@
           </div>
           <div v-else>
             <div class="input-container">
-              <el-form-item class="grouped-settings-header">
+              <el-form-item :data-search="setting.key || setting.group" class="grouped-settings-header">
                 <span slot="label">
                   <el-tooltip v-if="isDesktop && canBeDeleted(setting.key)" :content="$t('settings.removeFromDB')" placement="bottom-end">
                     <el-button icon="el-icon-delete" circle size="mini" style="margin-left:5px" @click="removeSetting(setting.key)"/>
diff --git a/src/views/settings/components/inputComponents/AutoLinkerInput.vue b/src/views/settings/components/inputComponents/AutoLinkerInput.vue
index 1bb1e506..b14f914e 100644
--- a/src/views/settings/components/inputComponents/AutoLinkerInput.vue
+++ b/src/views/settings/components/inputComponents/AutoLinkerInput.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <div v-if="setting.key === ':class' || setting.key === ':rel'" :data-search="setting.key">
+    <div v-if="setting.key === ':class' || setting.key === ':rel'" :data-search="setting.key || setting.group">
       <el-switch :value="autoLinkerBooleanValue(setting.key)" @change="processTwoTypeValue($event, setting.key)"/>
       <el-input v-if="autoLinkerBooleanValue(setting.key)" :value="autoLinkerStringValue(setting.key)" @input="processTwoTypeValue($event, setting.key)"/>
     </div>
-    <div v-if="setting.key === ':truncate'" :data-search="setting.key">
+    <div v-if="setting.key === ':truncate'" :data-search="setting.key || setting.group">
       <el-switch :value="autoLinkerBooleanValue(setting.key)" @change="processTwoTypeValue($event, setting.key)"/>
       <el-input-number v-if="autoLinkerBooleanValue(setting.key)" :value="autoLinkerIntegerValue(setting.key)" @input="processTwoTypeValue($event, setting.key)"/>
     </div>
diff --git a/src/views/settings/components/inputComponents/EditableKeywordInput.vue b/src/views/settings/components/inputComponents/EditableKeywordInput.vue
index ec8aa079..009b2033 100644
--- a/src/views/settings/components/inputComponents/EditableKeywordInput.vue
+++ b/src/views/settings/components/inputComponents/EditableKeywordInput.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="editable-keyword-container">
-    <div v-if="setting.key === ':replace'" :data-search="setting.key">
+    <div v-if="setting.key === ':replace'" :data-search="setting.key || setting.group">
       <div v-for="element in data" :key="getId(element)" class="setting-input">
         <el-input :value="getKey(element)" placeholder="pattern" class="name-input" @input="parseEditableKeyword($event, 'key', element)"/> :
         <el-input :value="getValue(element)" placeholder="replacement" class="value-input" @input="parseEditableKeyword($event, 'value', element)"/>
@@ -8,7 +8,7 @@
       </div>
       <el-button :size="isDesktop ? 'medium' : 'mini'" icon="el-icon-plus" circle @click="addRowToEditableKeyword"/>
     </div>
-    <div v-else-if="editableKeywordWithInteger" :data-search="setting.key">
+    <div v-else-if="editableKeywordWithInteger" :data-search="setting.key || setting.group">
       <div v-for="element in data" :key="getId(element)" class="setting-input">
         <el-input :value="getKey(element)" placeholder="key" class="name-input" @input="parseEditableKeyword($event, 'key', element)"/> :
         <el-input-number :value="getValue(element)" :min="0" size="large" class="value-input" @change="parseEditableKeyword($event, 'value', element)"/>
@@ -16,7 +16,7 @@
       </div>
       <el-button :size="isDesktop ? 'medium' : 'mini'" icon="el-icon-plus" circle @click="addRowToEditableKeyword"/>
     </div>
-    <div v-else :data-search="setting.key">
+    <div v-else :data-search="setting.key || setting.group">
       <div v-for="element in data" :key="getId(element)" class="setting-input">
         <el-input :value="getKey(element)" placeholder="key" class="name-input" @input="parseEditableKeyword($event, 'key', element)"/> :
         <el-select :value="getValue(element)" multiple filterable allow-create class="value-input" @change="parseEditableKeyword($event, 'value', element)"/>
diff --git a/src/views/settings/components/inputComponents/IconsInput.vue b/src/views/settings/components/inputComponents/IconsInput.vue
index 79533f24..e2f09165 100644
--- a/src/views/settings/components/inputComponents/IconsInput.vue
+++ b/src/views/settings/components/inputComponents/IconsInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :data-search="setting.key" class="mascot-container">
+  <div :data-search="setting.key || setting.group" class="mascot-container">
     <div v-for="(icon, index) in data" :key="index" class="mascot">
       <div class="icons-container">
         <div class="icon-container">
diff --git a/src/views/settings/components/inputComponents/MascotsInput.vue b/src/views/settings/components/inputComponents/MascotsInput.vue
index add5da77..e9d94e51 100644
--- a/src/views/settings/components/inputComponents/MascotsInput.vue
+++ b/src/views/settings/components/inputComponents/MascotsInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :data-search="setting.key" class="mascot-container">
+  <div :data-search="setting.key || setting.group" class="mascot-container">
     <div v-for="mascot in data" :key="getId(mascot)" class="mascot">
       <el-form-item label="Name" label-width="85px" class="mascot-form-item">
         <div class="mascot-name-container">
diff --git a/src/views/settings/components/inputComponents/MultipleSelect.vue b/src/views/settings/components/inputComponents/MultipleSelect.vue
index 41de8dfc..66b3aa75 100644
--- a/src/views/settings/components/inputComponents/MultipleSelect.vue
+++ b/src/views/settings/components/inputComponents/MultipleSelect.vue
@@ -3,7 +3,7 @@
     <el-select
       v-if="setting.key === ':backends'"
       :value="data.value"
-      :data-search="setting.key"
+      :data-search="setting.key || setting.group"
       multiple
       filterable
       allow-create
@@ -16,7 +16,7 @@
     <el-select
       v-if="setting.key === ':args'"
       :value="data[setting.key]"
-      :data-search="setting.key"
+      :data-search="setting.key || setting.group"
       multiple
       filterable
       allow-create
diff --git a/src/views/settings/components/inputComponents/ProxyUrlInput.vue b/src/views/settings/components/inputComponents/ProxyUrlInput.vue
index 54d5a7ad..c2ee2381 100644
--- a/src/views/settings/components/inputComponents/ProxyUrlInput.vue
+++ b/src/views/settings/components/inputComponents/ProxyUrlInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :data-search="setting.key" class="proxy-url-input">
+  <div :data-search="setting.key || setting.group" class="proxy-url-input">
     <el-input
       :value="proxyUrlData.host"
       placeholder="host (e.g. localhost or 127.0.0.1)"
diff --git a/src/views/settings/components/inputComponents/PruneInput.vue b/src/views/settings/components/inputComponents/PruneInput.vue
index 9d068a2b..7c17415d 100644
--- a/src/views/settings/components/inputComponents/PruneInput.vue
+++ b/src/views/settings/components/inputComponents/PruneInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :data-search="setting.key">
+  <div :data-search="setting.key || setting.group">
     <el-radio-group v-model="prune" class="prune-options">
       <el-radio label=":disabled">Disabled</el-radio>
       <el-radio label=":maxlen">Limit-based</el-radio>
diff --git a/src/views/settings/components/inputComponents/RateLimitInput.vue b/src/views/settings/components/inputComponents/RateLimitInput.vue
index ca70ca33..431ae83b 100644
--- a/src/views/settings/components/inputComponents/RateLimitInput.vue
+++ b/src/views/settings/components/inputComponents/RateLimitInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :data-search="setting.key" class="rate-limit-container">
+  <div :data-search="setting.key || setting.group" class="rate-limit-container">
     <div v-if="!rateLimitAuthUsers">
       <el-input
         :value="rateLimitAllUsers[0]"
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index da8ca8c0..76fe458f 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -27,6 +27,7 @@
             v-model="searchQuery"
             :fetch-suggestions="querySearch"
             :trigger-on-focus="false"
+            clearable
             placeholder="Search"
             prefix-icon="el-icon-search"
             class="settings-search-input"
@@ -229,7 +230,9 @@ export default {
       })
       await this.$store.dispatch('SetActiveTab', tab)
       const selectedSetting = document.querySelector(`[data-search="${selectedValue.key}"]`)
-      selectedSetting.scrollIntoView({ block: 'start', behavior: 'smooth' })
+      if (selectedSetting) {
+        selectedSetting.scrollIntoView({ block: 'start', behavior: 'smooth' })
+      }
     },
     querySearch(queryString, cb) {
       const results = this.searchData.filter(searchObj => searchObj.search.find(el => el.includes(queryString.toLowerCase())))