From b2efb696f16617c7b4edc218b5b34eecab9134d3 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Wed, 23 Sep 2026 21:17:58 +0300
Subject: [PATCH] Fix tier list maker tab switch scrolling to the top

The key was added in e1da2741d ("Fix switching tabs making the item pool
unresponsive") as a workaround for an unknown root cause. The drag & drop
code has changed a lot since then, and dragging with mouse or touch in any
direction after switching tabs now works without the remount, so this
removes it.
---
 app/features/tier-list-maker/routes/tier-list-maker.tsx | 1 -
 changelog/2026-09-23-tier-list-maker-tab-scroll.md      | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog/2026-09-23-tier-list-maker-tab-scroll.md

diff --git a/app/features/tier-list-maker/routes/tier-list-maker.tsx b/app/features/tier-list-maker/routes/tier-list-maker.tsx
index e61a3c970..2dba1b9e5 100644
--- a/app/features/tier-list-maker/routes/tier-list-maker.tsx
+++ b/app/features/tier-list-maker/routes/tier-list-maker.tsx
@@ -194,7 +194,6 @@ function TierListMakerContent() {
 			</div>
 
 			<DndContext
-				key={itemType}
 				sensors={sensors}
 				collisionDetection={tierAwareCollisionDetection}
 				modifiers={[restrictTierDragToVerticalAxis]}
diff --git a/changelog/2026-09-23-tier-list-maker-tab-scroll.md b/changelog/2026-09-23-tier-list-maker-tab-scroll.md
new file mode 100644
index 000000000..baaf5c417
--- /dev/null
+++ b/changelog/2026-09-23-tier-list-maker-tab-scroll.md
@@ -0,0 +1,5 @@
+---
+navItem: tier-list-maker
+type: bug
+---
+Switching tabs in the tier list maker no longer scrolls you back to the top of the page