diff --git a/.changeset/fuzzy-wolves-travel.md b/.changeset/fuzzy-wolves-travel.md
deleted file mode 100644
index 6b51be64c0..0000000000
--- a/.changeset/fuzzy-wolves-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Move filter to CatalogFilter component & wrap them in an accordion on smaller screens to improve the UX
diff --git a/.changeset/green-lies-hammer.md b/.changeset/green-lies-hammer.md
new file mode 100644
index 0000000000..bf0a9a3995
--- /dev/null
+++ b/.changeset/green-lies-hammer.md
@@ -0,0 +1,8 @@
+---
+'@backstage/core-components': patch
+'@backstage/test-utils': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-catalog': patch
+---
+
+Build a general TablePage component to enforce a more responsive layout for the Catalog & API page. Filters are now wrapped in an accordion on smaller screens, enabling the user to see & interact better with the table. Additionally, a test was added, to check that the responsive wrapping is working for the Catalog page.