diff --git a/.changeset/bright-pets-agree.md b/.changeset/bright-pets-agree.md
new file mode 100644
index 0000000000..375e583b59
--- /dev/null
+++ b/.changeset/bright-pets-agree.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Fixed double scrollbar issue that would appear on the Entity TechDocs view page that would stop the page from full scrolling to the top when navigating to a new page
diff --git a/.changeset/chatty-turkeys-brake.md b/.changeset/chatty-turkeys-brake.md
new file mode 100644
index 0000000000..1c90fc7cfe
--- /dev/null
+++ b/.changeset/chatty-turkeys-brake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Added `classNames` prop to the `Page` component