From 0d1953adc66a8fadb5eddd9a0b8b3fb31615c6ea Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 24 Jun 2026 09:28:14 +0400
Subject: [PATCH] Media Fields: Ensure the current post is always included in
 the initial options

---
 packages/media-fields/src/attached_to/edit.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/media-fields/src/attached_to/edit.tsx b/packages/media-fields/src/attached_to/edit.tsx
index ae98becfc7a1fc..35bf66a12d3699 100644
--- a/packages/media-fields/src/attached_to/edit.tsx
+++ b/packages/media-fields/src/attached_to/edit.tsx
@@ -90,13 +90,16 @@ export default function MediaAttachedToEdit( {
 			{}
 		);
 		setSearchResults( results );
-		const mappedSuggestions = results.map( ( result ) => {
+		const suggestions = results.map( ( result ) => {
 			return {
 				label: result.title,
 				value: result.id.toString(),
 			};
 		} );
-		setOptions( mappedSuggestions );
+		const includeCurrent =
+			! filterValue &&
+			suggestions.findIndex( ( s ) => s.value === value ) === -1;
+		setOptions( suggestions.concat( includeCurrent ? defaultPost : [] ) );
 		setIsLoading( false );
 	};