diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts
index 953d6f83bc..1a71602c8b 100644
--- a/src/panels/developer-tools/ha-panel-developer-tools.ts
+++ b/src/panels/developer-tools/ha-panel-developer-tools.ts
@@ -13,7 +13,6 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import scrollToTarget from "../../common/dom/scroll-to-target";
 import { navigate } from "../../common/navigate";
 import "../../components/ha-menu-button";
 import { haStyle } from "../../resources/styles";
@@ -86,13 +85,9 @@ class PanelDeveloperTools extends LitElement {
     const newPage = ev.detail.item.getAttribute("page-name");
     if (newPage !== this._page) {
       navigate(this, `/developer-tools/${newPage}`);
+    } else {
+      scrollTo(0, 0);
     }
-
-    scrollToTarget(
-      this,
-      // @ts-ignore
-      this.shadowRoot!.querySelector("app-header-layout").header.scrollTarget
-    );
   }
 
   private get _page() {