diff --git a/cypress/integration/sidebar.js b/cypress/integration/sidebar.js
index 72fe152678..6c7e3e2eee 100644
--- a/cypress/integration/sidebar.js
+++ b/cypress/integration/sidebar.js
@@ -72,8 +72,9 @@ context("Sidebar", () => {
 
 			// attach 1 more image to reach attachment limit
 			attach_file("cypress/fixtures/sample_attachments/attachment-11.txt");
+			cy.get(".layout-side-section").scrollTo("top", { ensureScrollable: false });
 			cy.get(".add-attachment-btn").should("be.hidden");
-			cy.get(".explore-link").should("be.visible");
+			// cy.get(".explore-link").should("be.visible");
 
 			// test "Show All" button
 			cy.get(".attachment-row").should("have.length", 10);
diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss
index 8b9422e316..718069a037 100644
--- a/frappe/public/scss/desk/form_sidebar.scss
+++ b/frappe/public/scss/desk/form_sidebar.scss
@@ -136,8 +136,15 @@
 	gap: 8px;
 }
 body[data-route^="Form"] {
-	.layout-side-section .form-sidebar {
-		width: var(--form-sidebar-width);
+	.layout-side-section {
+		overflow-y: auto;
+		overflow-x: hidden;
+		height: calc(100vh - var(--page-head-height));
+		position: sticky;
+		top: var(--page-head-height);
+		.form-sidebar {
+			width: var(--form-sidebar-width);
+		}
 	}
 }