diff --git a/layouts/shortcodes/common-defs-expandlarge.html b/layouts/shortcodes/common-defs-expandlarge.html
index 12f1607fca9..41673d78b30 100644
--- a/layouts/shortcodes/common-defs-expandlarge.html
+++ b/layouts/shortcodes/common-defs-expandlarge.html
@@ -22,7 +22,8 @@
 					{{end}}
 				</a>
 			</div>
-			<div id="expandable-{{with $title}}{{.}}{{else}}expand-default{{end}}" class="a-collapseContent collapse" role="tabpanel">
+			<div id="expandable-{{with $title}}{{.}}{{else}}expand-default{{end}}" 
+						class="a-collapseContent-searchable" role="tabpanel" hidden="until-found">
 				<div class="a-collapseContent-inside">
 					<a name="#{{$title}}"></a>
 					{{- template "list-descriptions" (dict "property" $def "propName" $title) -}}
@@ -30,4 +31,18 @@
 			</div>
 		</div>
 	{{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+
+<script lang="javascript">
+	// if (!('onbeforematch' in document.body)) {
+	// 	// fallback to original behavior
+  //   document.addEventListener('DOMContentLoaded', (event) => {
+  //       let divs = document.querySelectorAll('div.a-collapseContent-searchable');
+  //       divs.forEach((div) => {
+  //           div.classList.remove('a-collapseContent-searchable');
+  //           div.classList.add('a-collapseContent');
+  //       });
+  //   });
+	// }
+</script>
diff --git a/themes/hugo-theme-altinn/static/css/designsystem.css b/themes/hugo-theme-altinn/static/css/designsystem.css
index b1a5cddfadb..27a6fa88c84 100644
--- a/themes/hugo-theme-altinn/static/css/designsystem.css
+++ b/themes/hugo-theme-altinn/static/css/designsystem.css
@@ -275,6 +275,31 @@ template {
 [hidden] {
   display: none !important; }
 
+.a-collapseContent-searchable.collapse {
+  display: block;
+  content-visibility: hidden;
+}
+
+.a-collapseContent-searchable[hidden=until-found] {
+    display: block !important;
+    content-visibility: hidden;
+} 
+
+.a-collapseContent-searchable.collapsing[hidden=until-found] {
+  display: block !important;
+  content-visibility: visible;
+} 
+
+.a-collapseContent-searchable.collapse.show {
+  display: block;
+  content-visibility: visible;
+}
+
+.a-collapseContent-searchable.collapse.show[hidden=until-found] {
+  display: block;
+  content-visibility: visible;
+}
+
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   margin-bottom: 6px;