From 5adad5eb9f66b2412b8ebcd9872028f26b1d6ae7 Mon Sep 17 00:00:00 2001
From: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
Date: Mon, 28 Jul 2025 18:43:11 +0200
Subject: [PATCH 1/3] Prevent overwrite with prev state of search params

Signed-off-by: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
---
 .../components/EntityLayout/EntityLayout.tsx  | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
index bae1f7bd0c..65f904c285 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -361,7 +361,13 @@ export const EntityLayout = (props: EntityLayoutProps) => {
               UNSTABLE_extraContextMenuItems={UNSTABLE_extraContextMenuItems}
               UNSTABLE_contextMenuOptions={UNSTABLE_contextMenuOptions}
               onUnregisterEntity={() => setConfirmationDialogOpen(true)}
-              onInspectEntity={() => setSearchParams('inspect')}
+              onInspectEntity={() => {
+                setSearchParams(prev => {
+                  const newParams = new URLSearchParams(prev);
+                  newParams.set('inspect', '');
+                  return newParams;
+                });
+              }}
             />
           </>
         )}
@@ -401,9 +407,21 @@ export const EntityLayout = (props: EntityLayoutProps) => {
               typeof InspectEntityDialog
             >['initialTab']) || undefined
           }
-          onSelect={newTab => setSearchParams(`inspect=${newTab}`)}
+          onSelect={newTab =>
+            setSearchParams(prev => {
+              const newParams = new URLSearchParams(prev);
+              newParams.set('inspect', newTab);
+              return newParams;
+            })
+          }
           open
-          onClose={() => setSearchParams()}
+          onClose={() =>
+            setSearchParams(prev => {
+              const newParams = new URLSearchParams(prev);
+              newParams.delete('inspect');
+              return newParams;
+            })
+          }
         />
       )}
 

From b158801e2ec4b5978842db87538bb3589ee12dc9 Mon Sep 17 00:00:00 2001
From: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
Date: Mon, 28 Jul 2025 19:49:12 +0200
Subject: [PATCH 2/3] Add changeset

Signed-off-by: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
---
 .changeset/two-bars-warn.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/two-bars-warn.md

diff --git a/.changeset/two-bars-warn.md b/.changeset/two-bars-warn.md
new file mode 100644
index 0000000000..7f1dbea32c
--- /dev/null
+++ b/.changeset/two-bars-warn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Fixed bug in EntityLayout that caused wiping existing query parameters when opening the InspectEntityDialog.
\ No newline at end of file

From a5b51024de068b1801e8003b3ecb2ea1aa839f5d Mon Sep 17 00:00:00 2001
From: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
Date: Mon, 28 Jul 2025 20:16:15 +0200
Subject: [PATCH 3/3] Fix prettier in changeset

Signed-off-by: Jordan Andrzejczak <jordan.andrzejczak@outlook.com>
---
 .changeset/two-bars-warn.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/two-bars-warn.md b/.changeset/two-bars-warn.md
index 7f1dbea32c..beef36201f 100644
--- a/.changeset/two-bars-warn.md
+++ b/.changeset/two-bars-warn.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog': patch
 ---
 
-Fixed bug in EntityLayout that caused wiping existing query parameters when opening the InspectEntityDialog.
\ No newline at end of file
+Fixed bug in EntityLayout that caused wiping existing query parameters when opening the InspectEntityDialog.