diff --git a/package-lock.json b/package-lock.json
index 3c0487e163..c1567c8673 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "react-router": "^7.11.0",
         "react-select": "^5.10.2",
         "react-textarea-autosize": "^8.5.9",
-        "react-window": "^1.8.11",
+        "react-window": "^2.2.5",
         "redux": "^5.0.1",
         "redux-persist": "^6.0.0",
         "redux-thunk": "^3.1.0",
@@ -52,7 +52,7 @@
         "@types/lodash": "^4.17.21",
         "@types/node": "^24.9.2",
         "@types/react-dom": "^19.2.3",
-        "@types/react-window": "^1.8.8",
+        "@types/react-window": "^2.0.0",
         "@types/uuid": "^11.0.0",
         "@vitejs/plugin-react-swc": "^4.2.2",
         "eslint": "^9.39.2",
@@ -2705,13 +2705,14 @@
       }
     },
     "node_modules/@types/react-window": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.8.tgz",
-      "integrity": "sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-2.0.0.tgz",
+      "integrity": "sha512-E8hMDtImEpMk1SjswSvqoSmYvk7GEtyVaTa/GJV++FdDNuMVVEzpAClyJ0nqeKYBrMkGiyH6M1+rPLM0Nu1exQ==",
+      "deprecated": "This is a stub types definition. react-window provides its own type definitions, so you do not need this installed.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "react-window": "*"
       }
     },
     "node_modules/@types/trusted-types": {
@@ -6202,28 +6203,15 @@
       }
     },
     "node_modules/react-window": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
-      "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-2.2.5.tgz",
+      "integrity": "sha512-6viWvPSZvVuMIe9hrl4IIZoVfO/npiqOb03m4Z9w+VihmVzBbiudUrtUqDpsWdKvd/Ai31TCR25CBcFFAUm28w==",
       "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.0.0",
-        "memoize-one": ">=3.1.1 <6"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      },
       "peerDependencies": {
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/react-window/node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
-      "license": "MIT"
-    },
     "node_modules/readdirp": {
       "version": "4.0.1",
       "dev": true,
diff --git a/package.json b/package.json
index 0a612b1258..db069db4e2 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "react-router": "^7.11.0",
     "react-select": "^5.10.2",
     "react-textarea-autosize": "^8.5.9",
-    "react-window": "^1.8.11",
+    "react-window": "^2.2.5",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^3.1.0",
@@ -67,7 +67,7 @@
     "@types/lodash": "^4.17.21",
     "@types/node": "^24.9.2",
     "@types/react-dom": "^19.2.3",
-    "@types/react-window": "^1.8.8",
+    "@types/react-window": "^2.0.0",
     "@types/uuid": "^11.0.0",
     "@vitejs/plugin-react-swc": "^4.2.2",
     "eslint": "^9.39.2",