diff --git a/Build/Sources/TypeScript/lowlevel/Resources/Public/TypeScript/ConfigurationView.ts b/Build/Sources/TypeScript/lowlevel/Resources/Public/TypeScript/ConfigurationView.ts
index 14b7af24613057f22639b47481ef0d403150dbd9..913d2d1db0db7b77107888cbf9eb3f5a196b3736 100644
--- a/Build/Sources/TypeScript/lowlevel/Resources/Public/TypeScript/ConfigurationView.ts
+++ b/Build/Sources/TypeScript/lowlevel/Resources/Public/TypeScript/ConfigurationView.ts
@@ -37,13 +37,15 @@ class ConfigurationView {
       // scroll page down, so the just opened subtree is visible after reload and not hidden by doc header
       // Determine scrollTo position, either first ".active" (search) or latest clicked element
       let scrollElement = document.querySelector(self.location.hash);
-      if(document.querySelector('.list-tree .active ')) {
+      if (document.querySelector('.list-tree .active ')) {
         scrollElement = document.querySelector('.list-tree .active ');
-      } else {
-        document.querySelector(self.location.hash).parentElement.parentElement.classList.add('active');
+      } else if (scrollElement) {
+        scrollElement.parentElement.parentElement.classList.add('active');
       }
 
-      scrollElement.scrollIntoView({ block: 'center' });
+      if (scrollElement) {
+        scrollElement.scrollIntoView({ block: 'center' });
+      }
     }
   }
 }
diff --git a/typo3/sysext/lowlevel/Resources/Public/JavaScript/ConfigurationView.js b/typo3/sysext/lowlevel/Resources/Public/JavaScript/ConfigurationView.js
index 6b79a9b67ef707f0aeebde2a33587f9e6e0856ac..4c3f45522afbcb6fe64c61eb7978dd8bde92da82 100644
--- a/typo3/sysext/lowlevel/Resources/Public/JavaScript/ConfigurationView.js
+++ b/typo3/sysext/lowlevel/Resources/Public/JavaScript/ConfigurationView.js
@@ -10,4 +10,4 @@
  *
  * The TYPO3 project - inspiring people to share!
  */
-define(["require","exports","TYPO3/CMS/Core/DocumentService","TYPO3/CMS/Core/Event/RegularEvent"],(function(e,t,r,s){"use strict";return new class{constructor(){if(this.searchForm=document.querySelector("#ConfigurationView"),this.searchField=this.searchForm.querySelector('input[name="searchString"]'),this.searchResultShown=""!==this.searchField.value,r.ready().then(()=>{new s("search",()=>{""===this.searchField.value&&this.searchResultShown&&this.searchForm.submit()}).bindTo(this.searchField)}),self.location.hash){let e=document.querySelector(self.location.hash);document.querySelector(".list-tree .active ")?e=document.querySelector(".list-tree .active "):document.querySelector(self.location.hash).parentElement.parentElement.classList.add("active"),e.scrollIntoView({block:"center"})}}}}));
\ No newline at end of file
+define(["require","exports","TYPO3/CMS/Core/DocumentService","TYPO3/CMS/Core/Event/RegularEvent"],(function(e,t,r,s){"use strict";return new class{constructor(){if(this.searchForm=document.querySelector("#ConfigurationView"),this.searchField=this.searchForm.querySelector('input[name="searchString"]'),this.searchResultShown=""!==this.searchField.value,r.ready().then(()=>{new s("search",()=>{""===this.searchField.value&&this.searchResultShown&&this.searchForm.submit()}).bindTo(this.searchField)}),self.location.hash){let e=document.querySelector(self.location.hash);document.querySelector(".list-tree .active ")?e=document.querySelector(".list-tree .active "):e&&e.parentElement.parentElement.classList.add("active"),e&&e.scrollIntoView({block:"center"})}}}}));
\ No newline at end of file