diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index 6231023c1..29cc19b8a 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -8,7 +8,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title"><ModuleTitle /></h5>
-                    <form method="post" class="app-form-inline" @formname="AdminContainerForm" @onsubmit="@CloseModal" data-enhance>
+                    <form method="post" class="app-form-inline" @formname="AdminContainerForm" @onsubmit="@(async () => await CloseModal())" data-enhance>
                         <input type="hidden" name="__RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
                         <button type="submit" class="btn-close" aria-label="Close"></button>
                     </form>
@@ -22,9 +22,9 @@
 </div>
 
 @code {
-	private void CloseModal()
-	{
-		NavigationManager.NavigateTo((!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl());
+    private async Task CloseModal()
+    {
+        NavigationManager.NavigateTo((!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl());
     }
 }