diff --git a/src/Tests/Grand.Web.Common.Tests/Properties/launchSettings.json b/src/Tests/Grand.Web.Common.Tests/Properties/launchSettings.json
new file mode 100644
index 000000000..41e2fb772
--- /dev/null
+++ b/src/Tests/Grand.Web.Common.Tests/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Grand.Web.Common.Tests": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:51564;http://localhost:51565"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.cs
index b8c719bde..414a9a005 100644
--- a/src/Web/Grand.Web/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web/Controllers/OrderController.cs
@@ -21,6 +21,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Grand.Web.Common.Security.Authorization;
 using Grand.Domain.Customers;
+using MongoDB.Driver;
 
 namespace Grand.Web.Controllers
 {
@@ -80,6 +81,19 @@ protected virtual bool IsPostBeingDone {
         #endregion
 
         #region Methods
+        
+
+        [HttpPost]
+        public virtual async Task<IActionResult> Search( int orderNumber)
+        {
+            var order = await _orderService.GetOrderByNumber(orderNumber);
+            if (!await order.Access(_workContext.CurrentCustomer, _groupService))
+                return Challenge();
+
+            var model = await _mediator.Send(new GetOrderDetails { Order = order, Language = _workContext.WorkingLanguage });
+
+            return View("Details",model);
+        }
 
         //My account / Orders
         [HttpGet]
@@ -92,6 +106,7 @@ public virtual async Task<IActionResult> CustomerOrders(OrderPagingModel command
                 Store = _workContext.CurrentStore,
                 Command = command
             });
+            
             return View(model);
         }
 
diff --git a/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml b/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
index d40887bd0..2a7041e0c 100644
--- a/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
+++ b/src/Web/Grand.Web/Views/Order/CustomerOrders.cshtml
@@ -14,8 +14,27 @@
     @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Orders })
 }
 <div class="page account-page order-list-page pl-lg-3 pt-lg-0 pt-3">
-    <h1 class="generalTitle h2">@Loc["Account.CustomerOrders"]</h1>
-    @if (Model.Orders.Any())
+	<h1 class="generalTitle h2">@Loc["Account.CustomerOrders"]</h1>
+    
+	<!-- Search Bar 
+	<div class="order-search-bar mb-3">
+		<form method="get" action="@Url.Action("CustomerOrders")">
+			<div class="input-group">
+				<input type="text" class="form-control" name="searchOrderNumber" placeholder="@Loc["Account.CustomerOrders.SearchOrderNumber"]" />
+				<div class="input-group-append">
+					<button type="submit" class="btn btn-primary">@Loc["Account.CustomerOrders.Search"]</button>
+				</div>
+			</div>
+		</form>
+	</div> -->
+    @using (Html.BeginForm("Search", "Order", FormMethod.Post))
+	{
+		<label for="orderNumber">Order Number:</label>
+		<input type="text" name="orderNumber" required />
+		<button type="submit">Search</button>
+	}
+
+	@if (Model.Orders.Any())
     {
         <div class="account-order table-responsive">
             <table class="table hover-table">