@@ -6,6 +6,10 @@
 
 -   Add an "Attachments" source to the block inserter's Media tab, listing images attached to the current post with the ability to attach and detach them ([#79336](https://github.com/WordPress/gutenberg/pull/79336)).
 
+### Enhancements
+
+-   The "View the autosave" notice now opens the autosave in the visual revisions view with its changes highlighted, instead of the classic revisions screen. It falls back to the classic screen when visual revisions are disabled ([#79947](https://github.com/WordPress/gutenberg/pull/79947)).
+
 ### Bug Fixes
 
 -   External images are now sideloaded on the server when uploaded to the media library, via a new `mediaSideloadFromUrl` block editor setting, so the upload works when the editor is cross-origin isolated (e.g. with client-side media processing enabled) ([#79409](https://github.com/WordPress/gutenberg/pull/79409)).
 
@@ -22,6 +22,7 @@ import {
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
 import { createBlock } from '@wordpress/blocks';
+import { getQueryArg } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -309,6 +310,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			setCurrentTemplateId,
 			setEditedPost,
 			setRenderingMode,
+			setCurrentRevisionId,
 		} = unlock( useDispatch( editorStore ) );
 		const { editEntityRecord } = useDispatch( coreStore );
 		const registry = useRegistry();
@@ -344,6 +346,11 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 				setupEditor( post, initialEdits, settings.template );
 			}
 			if ( settings.autosave ) {
+				// The only place core exposes the autosave ID is the edit
+				// link, always `revision.php?revision=<autosave ID>`.
+				const autosaveId = Number(
+					getQueryArg( settings.autosave.editLink, 'revision' )
+				);
 				createWarningNotice(
 					__(
 						'There is an autosave of this post that is more recent than the version below.'
@@ -353,7 +360,28 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 						actions: [
 							{
 								label: __( 'View the autosave' ),
-								url: settings.autosave.editLink,
+								...( autosaveId
+									? {
+											onClick: () => {
+												// `disableVisualRevisions`
+												// is only set after mount,
+												// so read it at click time.
+												const {
+													disableVisualRevisions,
+												} = registry
+													.select( editorStore )
+													.getEditorSettings();
+												if ( disableVisualRevisions ) {
+													window.location.href =
+														settings.autosave.editLink;
+													return;
+												}
+												setCurrentRevisionId(
+													autosaveId
+												);
+											},
+									  }
+									: { url: settings.autosave.editLink } ),
 							},
 						],
 					}
 
@@ -746,6 +746,13 @@ export const restoreRevision =
 
 		// Save the post to persist the restored revision.
 		await dispatch.savePost();
+		if ( select.didPostSaveRequestFail() ) {
+			return;
+		}
+
+		// The saved post is now newer than any autosave, so the
+		// autosave notice is stale.
+		registry.dispatch( noticesStore ).removeNotice( 'autosave-exists' );
 
 		// Show success notice.
 		registry.dispatch( noticesStore ).createSuccessNotice(
 
@@ -336,6 +336,66 @@ test.describe( 'Autosave', () => {
 		);
 	} );
 
+	test( 'opens the visual revisions view from the autosave notice', async ( {
+		editor,
+		page,
+	} ) => {
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( 'before save' );
+		await editor.publishPost();
+
+		const paragraph = editor.canvas.getByRole( 'document', {
+			name: 'Block: Paragraph',
+		} );
+		await paragraph.click();
+		// Type slowly so the autosave happens more than 1s after publish.
+		await page.keyboard.type( ' after save', { delay: 100 } );
+
+		// Trigger a server-side autosave newer than the saved version.
+		await page.evaluate( () =>
+			window.wp.data.dispatch( 'core/editor' ).autosave()
+		);
+
+		await expect
+			.poll( async () => {
+				return await page.evaluate( () => {
+					const postId = window.wp.data
+						.select( 'core/editor' )
+						.getCurrentPostId();
+					const autosaves = window.wp.data
+						.select( 'core' )
+						.getAutosaves( 'post', postId );
+
+					return autosaves?.length ?? 0;
+				} );
+			} )
+			.toBeGreaterThanOrEqual( 1 );
+
+		// Reload so the autosave notice appears.
+		await page.reload();
+		await page.waitForFunction( () => window?.wp?.data );
+
+		const autosaveNotice = page
+			.locator( '.components-notice__content' )
+			.filter( {
+				hasText:
+					'There is an autosave of this post that is more recent than the version below.',
+			} );
+		await expect( autosaveNotice ).toBeVisible();
+
+		// Opening the autosave switches to the visual revisions view in place.
+		await page.getByRole( 'button', { name: 'View the autosave' } ).click();
+		await expect(
+			page.getByRole( 'button', { name: 'Exit' } )
+		).toBeVisible();
+
+		// Restoring the autosave dismisses the notice.
+		await page.getByRole( 'button', { name: 'Restore' } ).click();
+		await expect( autosaveNotice ).toBeHidden();
+	} );
+
 	test.skip( 'should clear sessionStorage upon user logout', async ( {
 		page,
 		pageUtils,