diff --git a/epubjs/epub.js b/epubjs/epub.js
index c8af9446..a621d372 160000
--- a/epubjs/epub.js
+++ b/epubjs/epub.js
@@ -1 +1 @@
-Subproject commit c8af9446579aac722a0a86cb2bf44a5ee80100b4
+Subproject commit a621d3727bc75ad7e49f2d70941dc969be65dd21
diff --git a/src/common/components/sidebar/outline-view.js b/src/common/components/sidebar/outline-view.js
index 0e782945..2208d12d 100644
--- a/src/common/components/sidebar/outline-view.js
+++ b/src/common/components/sidebar/outline-view.js
@@ -43,7 +43,7 @@ function Item({ item, id, children, onOpenLink, onUpdate, onSelect }) {
 	let { expanded, active } = item;
 
 	return (
-		<li>
+		<li id={`outline-${id}`} aria-label={item.title}>
 			<div
 				className={cx('item', { expandable: !!item.items?.length, expanded, active })}
 				data-id={id}
@@ -76,20 +76,20 @@ function OutlineView({ outline, onNavigate, onOpenLink, onUpdate}) {
 		}
 	}
 
-	function handleKeyDown(event) {
-		let { key } = event;
-
-		let list = [];
-		function flatten(items) {
-			for (let item of items) {
-				list.push(item);
-				if (item.items && item.expanded) {
-					flatten(item.items);
-				}
+	function flatten(items, list = []) {
+		for (let item of items) {
+			list.push(item);
+			if (item.items && item.expanded) {
+				flatten(item.items, list);
 			}
 		}
+		return list;
+	}
+	
+	function handleKeyDown(event) {
+		let { key } = event;
 
-		flatten(outline);
+		let list = flatten(outline);
 
 		let currentIndex = list.findIndex(x => x.active);
 		let currentItem = list[currentIndex];
@@ -166,6 +166,7 @@ function OutlineView({ outline, onNavigate, onOpenLink, onUpdate}) {
 		);
 	}
 
+	let active = flatten(outline || []).findIndex(item => item.active);
 	return (
 		<div
 			ref={containerRef}
@@ -173,9 +174,10 @@ function OutlineView({ outline, onNavigate, onOpenLink, onUpdate}) {
 			data-tabstop="1"
 			tabIndex={-1}
 			id="outlineView"
-			role="tabpanel"
+			role="listbox"
 			aria-labelledby="viewOutline"
 			onKeyDown={handleKeyDown}
+			aria-activedescendant={active !== -1 ? `outline-${active}` : null}
 		>
 			{outline === null ? <div className="spinner"/> : renderItems(outline)}
 		</div>
diff --git a/src/common/components/sidebar/sidebar.js b/src/common/components/sidebar/sidebar.js
index dfd51e0f..66a533e3 100644
--- a/src/common/components/sidebar/sidebar.js
+++ b/src/common/components/sidebar/sidebar.js
@@ -19,7 +19,7 @@ function Sidebar(props) {
 	}
 
 	return (
-		<div id="sidebarContainer" className="sidebarOpen">
+		<div id="sidebarContainer" className="sidebarOpen" role="application">
 			<div className="sidebar-toolbar">
 				<div className="start" data-tabstop={1} role="tablist">
 					{props.type === 'pdf' &&
@@ -72,7 +72,7 @@ function Sidebar(props) {
 				<div id="annotationsView" role="tabpanel" aria-labelledby="viewAnnotations" className={cx("viewWrapper", { hidden: props.view !== 'annotations'})}>
 					{props.annotationsView}
 				</div>
-				<div className={cx("viewWrapper", { hidden: props.view !== 'outline'})}>
+				<div className={cx("viewWrapper", { hidden: props.view !== 'outline' })} role="tabpanel">
 					{props.outlineView}
 				</div>
 			</div>
diff --git a/src/common/components/toolbar.js b/src/common/components/toolbar.js
index d491ddeb..ca1a4ddf 100644
--- a/src/common/components/toolbar.js
+++ b/src/common/components/toolbar.js
@@ -73,7 +73,7 @@ function Toolbar(props) {
 	}
 
 	return (
-		<div className="toolbar" data-tabstop={1}>
+		<div className="toolbar" data-tabstop={1} role="application">
 			<div className="start">
 				<button
 					id="sidebarToggle"
diff --git a/src/common/reader.js b/src/common/reader.js
index 31ecc2fa..6e6b3322 100644
--- a/src/common/reader.js
+++ b/src/common/reader.js
@@ -186,6 +186,10 @@ class Reader {
 				entireWord: false,
 				result: null
 			},
+			a11yVirtualCursorTarget: {
+				node: null,
+				ts: null
+			}
 		};
 
 		if (options.secondaryViewState) {
@@ -655,23 +659,11 @@ class Reader {
 		this._onTextSelectionAnnotationModeChange(mode);
 	}
 
-	// Announce the index of current search result to screen readers
-	setA11ySearchResultMessage(primaryView) {
-		let result = (primaryView ? this._state.primaryViewFindState : this._state.secondaryViewFindState).result;
-		if (!result) return;
-		let searchIndex = `${this._getString("pdfReader.searchResultIndex")}: ${result.index + 1}`;
-		let totalResults = `${this._getString("pdfReader.searchResultTotal")}: ${result.total}`;
-		this.setA11yMessage(`${searchIndex}. ${totalResults}`);
-	}
-
 	findNext(primary) {
 		if (primary === undefined) {
 			primary = this._lastViewPrimary;
 		}
 		(primary ? this._primaryView : this._secondaryView).findNext();
-		setTimeout(() => {
-			this.setA11ySearchResultMessage(primary);
-		});
 	}
 
 	findPrevious(primary) {
@@ -679,9 +671,6 @@ class Reader {
 			primary = this._lastViewPrimary;
 		}
 		(primary ? this._primaryView : this._secondaryView).findPrevious();
-		setTimeout(() => {
-			this.setA11ySearchResultMessage(primary);
-		});
 	}
 
 	toggleEPUBAppearancePopup({ open }) {
@@ -797,6 +786,7 @@ class Reader {
 			this.focusView(primary);
 			// A workaround for Firefox/Zotero because iframe focusing doesn't trigger 'focusin' event
 			this._focusManager._closeFindPopupIfEmpty();
+			this.placeA11yVirtualCursor();
 		};
 
 		let onRequestPassword = () => {
@@ -862,6 +852,35 @@ class Reader {
 			this.setA11yMessage(annotationContent);
 		}
 
+		// Add page number as aria-label to provided node to improve screen reader navigation
+		let setA11yNavContent = (node, pageIndex) => {
+			node.setAttribute('aria-label', `${this._getString("pdfReader.page")}: ${pageIndex}`);
+		};
+
+		// Set which node should receive focus when the focus enters the reader to
+		// help screen readers place virtual cursor at the right location
+		let setA11yVirtualCursorTarget = (node) => {
+			if (node && node !== this._state.a11yVirtualCursorTarget.node) {
+				this._updateState({ a11yVirtualCursorTarget: { node, ts: Date.now() } });
+			}
+			// Clear the cursor only half a second after it was set. It ensures the
+			// target is not cleared by scrolling of the document during outline navigation.
+			// Particularly important for snapshots where a random scroll event would fire after
+			// debounceUntilScrollFinishes is done. In all other instances of scrolling,
+			// the virtual cursor target is cleared
+			if (node === null && Date.now() - this._state.a11yVirtualCursorTarget.ts > 500) {
+				this._updateState({ a11yVirtualCursorTarget: { node: null, ts: null } });
+			}
+		};
+
+		// Announce the search index, page and snippet of the search result
+		let a11yAnnounceSearchMessage = (index, total, pageLabel, snippet) => {
+			let searchIndex = `${this._getString("pdfReader.searchResultIndex")}: ${index + 1}.`;
+			let totalResults = `${this._getString("pdfReader.searchResultTotal")}: ${total}.`;
+			let page = pageLabel !== null ? `${this._getString("pdfReader.page")}: ${pageLabel}.` : "";
+			this.setA11yMessage(`${searchIndex} ${totalResults} ${snippet || ""} ${page}`);
+		};
+
 		let data;
 		if (this._type === 'pdf') {
 			data = this._data;
@@ -908,7 +927,9 @@ class Reader {
 			onTabOut,
 			onKeyDown,
 			onKeyUp,
-			onFocusAnnotation
+			onFocusAnnotation,
+			setA11yVirtualCursorTarget,
+			a11yAnnounceSearchMessage
 		};
 
 		if (this._type === 'pdf') {
@@ -939,6 +960,7 @@ class Reader {
 				fontFamily: this._state.fontFamily,
 				hyphenate: this._state.hyphenate,
 				onEPUBEncrypted,
+				setA11yNavContent,
 			});
 		} else if (this._type === 'snapshot') {
 			view = new SnapshotView({
@@ -965,6 +987,46 @@ class Reader {
 		document.getElementById("a11yAnnouncement").innerText = a11yMessage;
 	}
 
+	// Make a11yVirtualCursorTarget node set previously focusable and
+	// focus it to help screen readers understand where the virtual cursor needs to
+	// be positioned. This is required because screen readers are not aware of
+	// scroll positioning, so without this, the virtual cursor will always land
+	// at the start of the document.
+	placeA11yVirtualCursor() {
+		let target = this._state.a11yVirtualCursorTarget.node;
+		let doc = this._lastView._iframe.contentDocument;
+		// If the target is a text node, use its parent (e.g. <p> or <h>)
+		if (target?.nodeType === Node.TEXT_NODE) {
+			target = target.parentNode;
+		}
+		if (!target || !doc.contains(target)) return;
+		// Make it temporarily focusable
+		target.setAttribute("tabindex", "-1");
+		target.focus();
+
+		// On blur or keypress, blur it
+		if (doc.activeElement == target) {
+			target.addEventListener("blur", (_) => {
+				target.removeAttribute("tabindex");
+			});
+			target.addEventListener("keydown", (_) => {
+				target.blur();
+			});
+			// Keypress may not fire if screen reader is being used, in which
+			// case remove tabindex next time the page content is scrolled
+			let cleanUpOnScroll = (_) => {
+				target.blur();
+				doc.removeEventListener("scroll", cleanUpOnScroll);
+			};
+			doc.addEventListener("scroll", cleanUpOnScroll);
+		}
+		// If the focus didn't take, make sure temp tabindex is removed
+		else {
+			target.removeAttribute("tabindex");
+		}
+		this._updateState({ a11yVirtualCursorTarget: { node: null, ts: null } });
+	}
+
 	getUnsavedAnnotations() {
 
 	}
diff --git a/src/dom/common/dom-view.tsx b/src/dom/common/dom-view.tsx
index 9d2c4e23..97d0ad20 100644
--- a/src/dom/common/dom-view.tsx
+++ b/src/dom/common/dom-view.tsx
@@ -1138,6 +1138,9 @@ abstract class DOMView<State extends DOMViewState, Data> {
 			this._renderAnnotations();
 			this._repositionPopups();
 		});
+		// Clear whatever node we may have planned to focus for screen readers
+		// to not interfere with mouse navigation
+		this._options.setA11yVirtualCursorTarget(null);
 	}
 
 	protected _handleScrollCapture(event: Event) {
@@ -1412,6 +1415,9 @@ export type DOMViewOptions<State extends DOMViewState, Data> = {
 	onKeyUp: (event: KeyboardEvent) => void;
 	onKeyDown: (event: KeyboardEvent) => void;
 	onEPUBEncrypted: () => void;
+	setA11yVirtualCursorTarget: (node: Node | null) => void;
+	setA11yNavContent: (node: Node, pageIndex: string) => void;
+	a11yAnnounceSearchMessage: (index: number, total: number, pageLabel: string | null, snippet: string) => void;
 	data: Data & {
 		buf?: Uint8Array,
 		url?: string
diff --git a/src/dom/common/lib/range.ts b/src/dom/common/lib/range.ts
index 4e1945b5..64845040 100644
--- a/src/dom/common/lib/range.ts
+++ b/src/dom/common/lib/range.ts
@@ -15,11 +15,14 @@ export class PersistentRange {
 
 	endOffset: number;
 
+	collapsed: boolean;
+
 	constructor(range: AbstractRange) {
 		this.startContainer = range.startContainer;
 		this.startOffset = range.startOffset;
 		this.endContainer = range.endContainer;
 		this.endOffset = range.endOffset;
+		this.collapsed = range.collapsed;
 	}
 
 	toRange(): Range {
diff --git a/src/dom/epub/epub-view.ts b/src/dom/epub/epub-view.ts
index 5aff68ed..9b76b141 100644
--- a/src/dom/epub/epub-view.ts
+++ b/src/dom/epub/epub-view.ts
@@ -22,6 +22,7 @@ import Epub, {
 	NavItem,
 } from "epubjs";
 import {
+	getStartElement,
 	moveRangeEndsIntoTextNodes,
 	PersistentRange,
 	splitRangeToTextNodes
@@ -42,6 +43,7 @@ import SectionRenderer from "./section-renderer";
 import Section from "epubjs/types/section";
 import {
 	closestElement,
+	getVisibleTextNodes,
 	getContainingBlock
 } from "../common/lib/nodes";
 import { StyleScoper } from "./lib/sanitize-and-render";
@@ -56,6 +58,7 @@ import {
 	ScrolledFlow
 } from "./flow";
 import { DEFAULT_EPUB_APPEARANCE, RTL_SCRIPTS } from "./defines";
+import { debounceUntilScrollFinishes } from "../../common/lib/utilities";
 
 class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 	protected _find: EPUBFindProcessor | null = null;
@@ -177,6 +180,7 @@ class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 		this._sectionsContainer.hidden = false;
 		this.pageMapping = this._initPageMapping(viewState.savedPageMapping);
 		this._initOutline();
+		this._addAriaNavigationLandmarks();
 
 		// Validate viewState and its properties
 		// Also make sure this doesn't trigger _updateViewState
@@ -342,6 +346,24 @@ class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 		}
 	}
 
+	// Add landmarks with page labels for screen reader navigation
+	private async _addAriaNavigationLandmarks() {
+		for (let [key, value] of this.pageMapping.tree.entries()) {
+			let node = key.startContainer;
+			let containingElement = closestElement(node);
+
+			if (!containingElement) continue;
+
+			// This is semantically not correct, as we are assigning
+			// navigation role to <p> and <h> nodes but this is the
+			// best solution to avoid adding nodes into the DOM, which
+			// will break CFIs.
+			containingElement.setAttribute("role", "navigation");
+
+			this._options.setA11yNavContent(containingElement, value);
+		}
+	}
+
 	override toSelector(range: Range): FragmentSelector | null {
 		range = moveRangeEndsIntoTextNodes(range);
 		let cfi = this.getCFI(range);
@@ -911,6 +933,7 @@ class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 			let result = await processor.next();
 			if (result) {
 				this.flow.scrollIntoView(result.range);
+				this.a11yHandleSearchResultUpdate(result.range);
 			}
 			this._renderAnnotations();
 		}
@@ -923,11 +946,30 @@ class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 			let result = await processor.prev();
 			if (result) {
 				this.flow.scrollIntoView(result.range);
+				this.a11yHandleSearchResultUpdate(result.range);
 			}
 			this._renderAnnotations();
 		}
 	}
 
+	// After the search result is switched to, record which node the
+	// search result is in to place screen readers' virtual cursor on it
+	// + announce the result.
+	async a11yHandleSearchResultUpdate(range: PersistentRange) {
+		await debounceUntilScrollFinishes(this._iframeDocument);
+
+		let searchResult = getStartElement(range);
+		let currentPageLabel = this.pageMapping.getPageLabel(range);
+		if (!searchResult || !this._findState?.result || !currentPageLabel) return;
+
+		this._options.setA11yVirtualCursorTarget(searchResult);
+
+		let { index, total } = this._findState.result;
+		
+		let snippet = this._findState.result.snippets[this._findState.result.index];
+		this._options.a11yAnnounceSearchMessage(index, total, currentPageLabel, snippet);
+	}
+
 	protected _setScale(scale: number) {
 		this._keepPosition(() => {
 			this.scale = scale;
@@ -994,6 +1036,12 @@ class EPUBView extends DOMView<EPUBViewState, EPUBViewData> {
 					return;
 				}
 				this.flow.scrollIntoView(view.container, options);
+				// Once scrolling is done, tell screen readers to focus the first textual element of
+				// the section. Used when you navigate to a new section via outline in the sidebar.
+				let firstText = getVisibleTextNodes(view.body)[0];
+				debounceUntilScrollFinishes(this._iframeDocument).then(() => {
+					this._options.setA11yVirtualCursorTarget(firstText || view.body);
+				});
 			}
 		}
 		else {
diff --git a/src/dom/snapshot/snapshot-view.ts b/src/dom/snapshot/snapshot-view.ts
index 2f13b7f8..218b75d1 100644
--- a/src/dom/snapshot/snapshot-view.ts
+++ b/src/dom/snapshot/snapshot-view.ts
@@ -9,7 +9,8 @@ import {
 } from "../../common/types";
 import {
 	getInnerText,
-	getStartElement
+	getStartElement,
+	PersistentRange
 } from "../common/lib/range";
 import {
 	CssSelector,
@@ -33,6 +34,7 @@ import injectCSS from './stylesheets/inject.scss';
 // @ts-expect-error
 import darkReaderJS from '!!raw-loader!darkreader/darkreader';
 import { DynamicThemeFix } from "darkreader";
+import { debounceUntilScrollFinishes } from "../../common/lib/utilities";
 
 class SnapshotView extends DOMView<SnapshotViewState, SnapshotViewData> {
 	protected _find: DefaultFindProcessor | null = null;
@@ -312,7 +314,15 @@ class SnapshotView extends DOMView<SnapshotViewState, SnapshotViewData> {
 	protected _navigateToSelector(selector: Selector, options: NavigateOptions = {}) {
 		let range = this.toDisplayedRange(selector);
 		if (range) {
-			getStartElement(range)?.scrollIntoView(options);
+			let elem = getStartElement(range);
+			if (!elem) return;
+			elem.scrollIntoView(options);
+			// Remember which node was navigated to for screen readers to place
+			// virtual cursor on it later. Used for navigating between sections in the outline.
+			this._options.setA11yVirtualCursorTarget(elem);
+			debounceUntilScrollFinishes(this._iframeDocument).then(() => {
+				this._options.setA11yVirtualCursorTarget(elem);
+			});
 		}
 		else {
 			console.warn('Not a valid snapshot selector', selector);
@@ -434,6 +444,7 @@ class SnapshotView extends DOMView<SnapshotViewState, SnapshotViewData> {
 			let result = this._find.next();
 			if (result) {
 				getStartElement(result.range)?.scrollIntoView({ block: 'center' });
+				this.a11yHandleSearchResultUpdate(result.range);
 			}
 			this._renderAnnotations();
 		}
@@ -445,11 +456,30 @@ class SnapshotView extends DOMView<SnapshotViewState, SnapshotViewData> {
 			let result = this._find.prev();
 			if (result) {
 				getStartElement(result.range)?.scrollIntoView({ block: 'center' });
+				this.a11yHandleSearchResultUpdate(result.range);
 			}
 			this._renderAnnotations();
 		}
 	}
 
+
+	// After the search result is switched to, record which node the
+	// search result is in to place screen readers' virtual cursor on it
+	// + announce the result.
+	async a11yHandleSearchResultUpdate(range: PersistentRange) {
+		await debounceUntilScrollFinishes(this._iframeDocument);
+
+		let searchResult = getStartElement(range);
+		if (!searchResult || !this._findState?.result) return;
+
+		this._options.setA11yVirtualCursorTarget(searchResult);
+
+		let { index, total } = this._findState.result;
+		
+		let snippet = this._findState.result.snippets[this._findState.result.index];
+		this._options.a11yAnnounceSearchMessage(index, total, null, snippet);
+	}
+
 	protected _setScale(scale: number) {
 		this.scale = scale;
 
diff --git a/src/pdf/pdf-view.js b/src/pdf/pdf-view.js
index e15ee5a0..f281cb3c 100644
--- a/src/pdf/pdf-view.js
+++ b/src/pdf/pdf-view.js
@@ -216,6 +216,9 @@ class PDFView {
 							this._onSetSelectionPopup({ ...this._selectionPopup, rect });
 						}
 					}
+					// Clear whichever node we wanted to focus for screen reader virtual cursor
+					// navigation to not interfere with mouse interface.
+					this._options.setA11yVirtualCursorTarget(null);
 				});
 
 				this._iframeWindow.addEventListener('focus', (event) => {
@@ -519,6 +522,8 @@ class PDFView {
 		for (let page of this._pages) {
 			if (!pageIndexes || pageIndexes.includes(page.pageIndex)) {
 				page.render();
+				// Aria label with page index set by pdf.js is off by one, so fix it here
+				page.originalPage.div.dataset.l10nArgs = JSON.stringify({ page: this._getPageLabel(page.pageIndex) });
 			}
 		}
 	}
@@ -658,6 +663,8 @@ class PDFView {
 					findPrevious: false
 				});
 			}
+			// Make sure the state is updated regardless to have last _findState.result value
+			this._findState = state;
 		}
 		else {
 			this._findState = state;
@@ -675,6 +682,7 @@ class PDFView {
 			highlightAll: this._findState.highlightAll,
 			findPrevious: false
 		});
+		this.a11yHandleSearchResultUpdate();
 	}
 
 	findPrevious() {
@@ -688,6 +696,30 @@ class PDFView {
 			highlightAll: this._findState.highlightAll,
 			findPrevious: true
 		});
+		this.a11yHandleSearchResultUpdate();
+	}
+
+
+	// After the search result is switched to, record which node the
+	// search result is in to place screen readers' virtual cursor on it
+	// + announce the result.
+	async a11yHandleSearchResultUpdate() {
+		await debounceUntilScrollFinishes(this._iframeWindow.document);
+		let searchResult = this._iframeWindow.document.querySelector(".highlight.selected.appended");
+		if (!searchResult || !this._findState.result) return;
+
+		this._options.setA11yVirtualCursorTarget(searchResult.parentNode);
+
+		let { index, total } = this._findState.result;
+		let { currentPageNumber } = this._iframeWindow.PDFViewerApplication.pdfViewer;
+		let pageLabel = this._getPageLabel(currentPageNumber - 1);
+
+		let span = searchResult.parentNode;
+		let previousSpanText = span.previousSibling?.textContent || "";
+		let nextSpanText = span.nextSibling?.textContent || "";
+		let snippet = previousSpanText + span.textContent + nextSpanText;
+
+		this._options.a11yAnnounceSearchMessage(index, total, pageLabel, snippet);
 	}
 
 	setSelectedAnnotationIDs(ids) {