From bb5ac924aed2e2bb7b1b6639fe972b68773a328b Mon Sep 17 00:00:00 2001
From: yusuf-multhan <yusuf-multhan@users.noreply.github.com>
Date: Fri, 23 Dec 2022 21:59:41 +0530
Subject: [PATCH] Folder: Folder name update redirects to desired location, for
 grafana served with subpath (#60721)

---
 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 e98f48a7475..ed9d5b8ca89 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`));
   };
 }