diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index 083876d5cc..6ab72b47d3 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -163,6 +163,7 @@ public open class HtmlRenderer(
                     contentTabs.forEachIndexed { index, contentTab ->
                         button(classes = "section-tab") {
                             if (index == 0) attributes["data-active"] = ""
+                            attributes["data-type"] = pageContext.getDocumentableType() ?: ""
                             attributes[TOGGLEABLE_CONTENT_TYPE_ATTR] =
                                 contentTab.tabbedContentTypes.joinToString(",") { it.toHtmlAttribute() }
                             text(contentTab.text)
diff --git a/plugins/base/src/main/resources/dokka/scripts/platform-content-handler.js b/plugins/base/src/main/resources/dokka/scripts/platform-content-handler.js
index 8c4ca53830..7fabb33d55 100644
--- a/plugins/base/src/main/resources/dokka/scripts/platform-content-handler.js
+++ b/plugins/base/src/main/resources/dokka/scripts/platform-content-handler.js
@@ -18,8 +18,6 @@ const samplesLightThemeName = 'idea'
 window.addEventListener('load', () => {
     document.querySelectorAll("div[data-platform-hinted]")
         .forEach(elem => elem.addEventListener('click', (event) => togglePlatformDependent(event, elem)))
-    document.querySelectorAll("div[tabs-section]")
-        .forEach(elem => elem.addEventListener('click', (event) => toggleSectionsEventHandler(event)))
     const filterSection = document.getElementById('filter-section')
     if (filterSection) {
         filterSection.addEventListener('click', (event) => filterButtonHandler(event))
@@ -177,19 +175,26 @@ function handleAnchor() {
 }
 
 function initTabs() {
-    document.querySelectorAll("div[tabs-section]")
-        .forEach(element => {
-            showCorrespondingTabBody(element)
-            element.addEventListener('click', (event) => toggleSectionsEventHandler(event))
-        })
-    let cached = localStorage.getItem("active-tab")
-    if (cached) {
-        let parsed = JSON.parse(cached)
-        let tab = document.querySelector('div[tabs-section] > button[data-togglable="' + parsed + '"]')
-        if (tab) {
-            toggleSections(tab)
-        }
-    }
+    document.querySelectorAll("div[tabs-section]").forEach(element => {
+        showCorrespondingTabBody(element)
+        element.addEventListener('click', (event) => toggleSectionsEventHandler(event))
+    });
+
+    initTabsForType("classlike");
+    initTabsForType("package");
+}
+
+function initTabsForType(type) {
+    const cached = localStorage.getItem("active-tab-" + type);
+    if (!cached) return;
+
+    const parsed = JSON.parse(cached);
+    const tab = document.querySelector(
+        'div[tabs-section] > button[data-togglable="' + parsed + '"][data-type="' + type + '"]'
+    );
+    if (!tab) return;
+
+    toggleSections(tab);
 }
 
 function showCorrespondingTabBody(element) {
@@ -294,9 +299,14 @@ function toggleSections(target) {
 }
 
 function toggleSectionsEventHandler(evt) {
-    if (!evt.target.getAttribute("data-togglable")) return
-    localStorage.setItem('active-tab', JSON.stringify(evt.target.getAttribute("data-togglable")))
-    toggleSections(evt.target)
+    const togglable = evt.target.getAttribute("data-togglable");
+    if (!togglable) return;
+
+    const type = evt.target.getAttribute("data-type");
+    if (!type) return;
+
+    localStorage.setItem('active-tab-' + type, JSON.stringify(togglable));
+    toggleSections(evt.target);
 }
 
 function togglePlatformDependent(e, container) {