From da35434f58d0b8be1c4bb9444c7db16603639715 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Wed, 18 Sep 2024 09:42:56 -0400
Subject: [PATCH] fix #4628 - preserve ReturnUrl when navigating to Settings
 component

---
 .../Themes/Controls/Container/ModuleActionsBase.cs         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
index 93e935b94..37cdb71af 100644
--- a/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
@@ -134,12 +134,11 @@ private async Task<string> DeleteModule(string url, PageModule pagemodule)
             return url;
         }
 
-        private async Task<string> Settings(string url, PageModule pagemodule)
+        private Task<string> Settings(string url, PageModule pagemodule)
         {
-            await Task.Yield();
-            var returnurl = Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, "edit=true");
+            var returnurl = NavigationManager.Uri.Substring(NavigationManager.BaseUri.Length - 1);
             url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, pagemodule.ModuleId, "Settings", "returnurl=" + WebUtility.UrlEncode(returnurl));
-            return url;
+            return Task.FromResult(url);
         }
 
         private async Task<string> Publish(string url, PageModule pagemodule)