diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index e3db205eef2bf..a40f482957802 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -63,7 +63,7 @@
 				</template>
 			</BreadCrumbs>
 
-			<NcButton v-if="filesListWidth >= 512"
+			<NcButton v-if="filesListWidth >= 512 && enableGridView"
 				:aria-label="gridViewButtonLabel"
 				:title="gridViewButtonLabel"
 				class="files-list__header-grid-button"
@@ -132,6 +132,7 @@ import { showError } from '@nextcloud/dialogs'
 import { translate, translatePlural } from '@nextcloud/l10n'
 import { Type } from '@nextcloud/sharing'
 import { UploadPicker } from '@nextcloud/upload'
+import { loadState } from '@nextcloud/initial-state'
 import { defineComponent } from 'vue'
 
 import LinkIcon from 'vue-material-design-icons/Link.vue'
@@ -193,6 +194,9 @@ export default defineComponent({
 		const uploaderStore = useUploaderStore()
 		const userConfigStore = useUserConfigStore()
 		const viewConfigStore = useViewConfigStore()
+
+		const enableGridView = loadState('code', 'enable_non-accessible_features', true)
+
 		return {
 			filesStore,
 			pathsStore,
@@ -200,6 +204,7 @@ export default defineComponent({
 			uploaderStore,
 			userConfigStore,
 			viewConfigStore,
+			enableGridView,
 		}
 	},
 
diff --git a/config/config.sample.php b/config/config.sample.php
index a1f7332c4047b..b7f0ba07aa8df 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -2400,9 +2400,9 @@
 'reference_opengraph' => true,
 
 /**
- * Enable use of old unified search
+ * Disable features that are do respect accessibility standards yet.
  *
- * Defaults to ``false``
+ * Defaults to ``true``
  */
-'unified_search.enabled' => false,
+'enable_non-accessible_features' => true,
 ];
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 057caaaf2fea4..820af8b82de10 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -179,7 +179,8 @@ public function getConfig(): string {
 			'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
 			'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
 			'version' => implode('.', Util::getVersion()),
-			'versionstring' => \OC_Util::getVersionString()
+			'versionstring' => \OC_Util::getVersionString(),
+			'enable_non-accessible_features' => $this->config->getSystemValue('enable_non-accessible_features', true),
 		];
 
 		$array = [
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 13ac3c5ef482f..5cb1b49b9deca 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -108,8 +108,8 @@ public function __construct($renderAs, $appId = '') {
 
 			$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
 			$this->initialState->provideInitialState('core', 'apps', $this->navigationManager->getAll());
-			
-			if ($this->config->getSystemValueBool('unified_search.enabled', false)) {
+
+			if (!$this->config->getSystemValueBool('enable_non-accessible_features', true)) {
 				$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
 				$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
 				$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');