From 654ac6cd8ae8fec34759f2d87df6c599a76f6a98 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 23 Dec 2022 17:44:23 +0100
Subject: [PATCH] [v9.3.x] Folder: Folder name update redirects to desired
 location, for grafana served with subpath (#60737)

---
 public/app/features/folders/state/actions.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/folders/state/actions.ts b/public/app/features/folders/state/actions.ts
index 68743eef477..1b3f12cd277 100644
--- a/public/app/features/folders/state/actions.ts
+++ b/public/app/features/folders/state/actions.ts
@@ -28,7 +28,8 @@ export function saveFolder(folder: FolderState): ThunkResult<void> {
     });
 
     dispatch(notifyApp(createSuccessNotification('Folder saved')));
-    locationService.push(`${res.url}/settings`);
+    dispatch(loadFolder(res));
+    locationService.push(locationUtil.stripBaseFromUrl(`${res.url}/settings`));
   };
 }