diff --git a/chrome/content/zotero/elements/attachmentAnnotationsBox.js b/chrome/content/zotero/elements/attachmentAnnotationsBox.js
index 7effc87911..e4e0498531 100644
--- a/chrome/content/zotero/elements/attachmentAnnotationsBox.js
+++ b/chrome/content/zotero/elements/attachmentAnnotationsBox.js
@@ -47,6 +47,14 @@
 
 		set item(item) {
 			super.item = (item instanceof Zotero.Item && item.isFileAttachment()) ? item : null;
+			if (item.isFileAttachment()) {
+				this._annotationItems = item.getAnnotations();
+				this.updateCount();
+			}
+			else {
+				this._annotationItems = [];
+				this._count = 0;
+			}
 			this._updateHidden();
 		}
 
@@ -87,10 +95,7 @@
 			this.updateCount();
 		}
 
-		render() {
-			this._annotationItems = this.item.getAnnotations();
-			this.updateCount();
-		}
+		render() {}
 
 		async asyncRender() {
 			if (!this.initialized || !this.item?.isFileAttachment()) return;
@@ -140,11 +145,12 @@
 			if (count === 0) {
 				this.hidden = true;
 			}
+			this._count = count;
 			return count;
 		}
 
 		_updateHidden() {
-			this.hidden = !this.item || this.tabType == "reader";
+			this.hidden = !this.item || this.tabType == "reader" || this._count == 0;
 		}
 	}
 	customElements.define("attachment-annotations-box", AttachmentAnnotationsBox);
diff --git a/chrome/content/zotero/elements/itemDetails.js b/chrome/content/zotero/elements/itemDetails.js
index 810637e53a..71b7365a03 100644
--- a/chrome/content/zotero/elements/itemDetails.js
+++ b/chrome/content/zotero/elements/itemDetails.js
@@ -236,6 +236,7 @@
 			this._lastUpdateCustomSection = "";
 
 			this._lastScrollTop = 0;
+			this._lastScrollPaneID = '';
 
 			// If true, will render on tab select
 			this._pendingRender = false;
@@ -283,6 +284,8 @@
 			// Checking flags in _handleIntersection is not reliable because it's async.
 			this._toggleIntersectionObserver(false);
 
+			let collapsed = this._collapsed;
+
 			for (let box of [this._header, ...panes]) {
 				box.editable = this.editable;
 				box.tabID = this.tabID;
@@ -294,40 +297,48 @@
 					box.discard();
 				}
 				// Execute sync render immediately
-				if (!box.hidden && box.render) {
+				if (!collapsed && !box.hidden && box.render) {
 					box.render();
 				}
 			}
 
-			let pinnedPaneElem = this.getEnabledPane(this.pinnedPane);
-			let pinnedIndex = panes.indexOf(pinnedPaneElem);
-			
-			this._paneParent.style.paddingBottom = '';
-			if (pinnedPaneElem) {
-				let paneID = pinnedPaneElem.dataset.pane;
-				await this.scrollToPane(paneID, 'instant');
-				this.pinnedPane = paneID;
-			}
-			else {
-				// Keep the scroll position after reordering
-				this._paneParent.scrollTo(0, this._lastScrollTop);
-				this._lastScrollTop = 0;
-			}
+			if (!collapsed) {
+				let scrollPaneElem = this.getEnabledPane(this._lastScrollPaneID);
+				// If the last scroll pane is not found, try the pinned pane
+				if (!scrollPaneElem) {
+					scrollPaneElem = this.getEnabledPane(this.pinnedPane);
+				}
 
-			// Only execute async render for visible panes
-			for (let box of panes) {
-				if (!box.asyncRender) {
-					continue;
+				let scrollPaneIndex = panes.indexOf(scrollPaneElem);
+				
+				this._paneParent.style.paddingBottom = '';
+
+				if (scrollPaneIndex > -1) {
+					let paneID = scrollPaneElem.dataset.pane;
+					await this.scrollToPane(paneID, 'instant');
+					this._lastScrollPaneID = '';
 				}
-				if (pinnedIndex > -1 && panes.indexOf(box) < pinnedIndex) {
-					continue;
+				else {
+					// Keep the scroll position after reordering
+					this._paneParent.scrollTo(0, this._lastScrollTop);
+					this._lastScrollTop = 0;
 				}
-				if (!this.isPaneVisible(box.dataset.pane)) {
-					continue;
+
+				// Only execute async render for visible panes
+				for (let box of panes) {
+					if (!box.asyncRender) {
+						continue;
+					}
+					if (scrollPaneIndex > -1 && panes.indexOf(box) < scrollPaneIndex) {
+						continue;
+					}
+					if (!this.isPaneVisible(box.dataset.pane)) {
+						continue;
+					}
+					await waitNoLongerThan(box.asyncRender(), 500);
+					// Make sure the layout is updated for next isPaneVisible check
+					await waitDOMUpdate();
 				}
-				await waitNoLongerThan(box.asyncRender(), 500);
-				// Make sure the layout is updated for next isPaneVisible check
-				await waitDOMUpdate();
 			}
 
 			if (this.item.id == item.id) {
@@ -510,7 +521,6 @@
 		 * @param {boolean} options.render - Whether to rerender panes after reordering
 		 */
 		async changePaneOrder(paneID, newIdx, options = {}) {
-
 			let panes = this.getPanes();
 			let paneIDs = panes.map(elem => elem.dataset.pane);
 			let currentIndex = paneIDs.indexOf(paneID);
@@ -542,6 +552,7 @@
 			// If the itemPane is collapsed, just remember which pane needs to be scrolled to
 			// when itemPane is expanded.
 			if (this._collapsed) {
+				this._lastScrollPaneID = paneID;
 				return null;
 			}
 
diff --git a/chrome/content/zotero/elements/itemPane.js b/chrome/content/zotero/elements/itemPane.js
index 895b0548f1..1d9d0a1119 100644
--- a/chrome/content/zotero/elements/itemPane.js
+++ b/chrome/content/zotero/elements/itemPane.js
@@ -193,11 +193,11 @@
 			this._itemDetails.item = item;
 			this._itemDetails.collectionTreeRow = this.collectionTreeRow;
 
+			this._itemDetails.render();
+
 			if (this.getAttribute("collapsed") == "true") {
 				return true;
 			}
-
-			this._itemDetails.render();
 			
 			if (item.isFeedItem) {
 				let lastTranslationTarget = Zotero.Prefs.get('feeds.lastTranslationTarget');
diff --git a/chrome/content/zotero/elements/itemPaneSidenav.js b/chrome/content/zotero/elements/itemPaneSidenav.js
index 3d65994e4e..8bde7496da 100644
--- a/chrome/content/zotero/elements/itemPaneSidenav.js
+++ b/chrome/content/zotero/elements/itemPaneSidenav.js
@@ -708,7 +708,7 @@
 			}
 		};
 
-		handleButtonClick = (event) => {
+		handleButtonClick = async (event) => {
 			let button = event.target;
 			let pane = button.dataset.pane;
 			if (!pane) return;
@@ -728,14 +728,14 @@
 					}
 					let pinnable = this.isPanePinnable(pane);
 					let scrollType = this._collapsed ? 'instant' : 'smooth';
-					if (this._collapsed) this._collapsed = false;
 					switch (event.detail) {
 						case 1:
 							if (this._contextNotesPane && this._contextNotesPaneVisible) {
 								this._contextNotesPaneVisible = false;
 								scrollType = 'instant';
 							}
-							this.container.scrollToPane(pane, scrollType);
+							// Call scrolling before expanding the pane to avoid flickering
+							await this.container.scrollToPane(pane, scrollType);
 							break;
 						case 2:
 							if (this.pinnedPane == pane || !pinnable) {
@@ -746,6 +746,7 @@
 							}
 							break;
 					}
+					if (this._collapsed) this._collapsed = false;
 				}
 			}
 			this.render();