diff --git a/quickshell/Modules/DankBar/DankBarContent.qml b/quickshell/Modules/DankBar/DankBarContent.qml
index 62aa1a888..59ce86524 100644
--- a/quickshell/Modules/DankBar/DankBarContent.qml
+++ b/quickshell/Modules/DankBar/DankBarContent.qml
@@ -1129,12 +1129,13 @@ Item {
             parentScreen: barWindow.screen
             onClicked: {
                 const section = topBarContent.getWidgetSection(parent) || "center";
+                const tabIndex = SettingsData.dashTabIndexForId("media");
                 topBarContent.openWidgetPopout({
                     loader: dankDashPopoutLoader,
                     widgetItem: mediaWidget,
                     section,
-                    tabIndex: 1,
-                    triggerSource: topBarContent._dashTriggerSource(section, 1),
+                    tabIndex,
+                    triggerSource: topBarContent._dashTriggerSource(section, tabIndex),
                     mode: "click",
                     useCenterSection: true,
                     setTriggerScreen: true
@@ -1156,12 +1157,13 @@ Item {
             parentScreen: barWindow.screen
             onClicked: {
                 const section = topBarContent.getWidgetSection(parent) || "center";
+                const tabIndex = SettingsData.dashTabIndexForId("weather");
                 topBarContent.openWidgetPopout({
                     loader: dankDashPopoutLoader,
                     widgetItem: weatherWidget,
                     section,
-                    tabIndex: 3,
-                    triggerSource: topBarContent._dashTriggerSource(section, 3),
+                    tabIndex,
+                    triggerSource: topBarContent._dashTriggerSource(section, tabIndex),
                     mode: "click",
                     useCenterSection: true,
                     setTriggerScreen: true
diff --git a/quickshell/Modules/DankBar/DankBarHoverController.qml b/quickshell/Modules/DankBar/DankBarHoverController.qml
index 6a29184b8..f200637b4 100644
--- a/quickshell/Modules/DankBar/DankBarHoverController.qml
+++ b/quickshell/Modules/DankBar/DankBarHoverController.qml
@@ -736,7 +736,7 @@ Item {
         case "music":
         case "weather":
             {
-                const tabIndex = widgetId === "clock" ? 0 : (widgetId === "music" ? 1 : 3);
+                const tabIndex = widgetId === "clock" ? 0 : SettingsData.dashTabIndexForId(widgetId === "music" ? "media" : "weather");
                 return barContent.openWidgetPopout(Object.assign({}, base, {
                     loader,
                     tabIndex,