diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
index 8fa79ae1..9bce364f 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
@@ -54,25 +54,27 @@
                         </div>
                         <abp-row>
                             <abp-column size="_2">
-                                @{
-                                    string imageUrl = $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.PictureUrl}";
-                                    <img class="img-size" src="@imageUrl" />
-                                }
+                                <a href="/ProductDetail/@item.ProductId.ToString()">
+                                    @{
+                                        string imageUrl = $"{options.Value.RemoteServices.Default.BaseUrl}product-images/{item.PictureUrl}";
+                                        <img class="img-size" src="@imageUrl" />
+                                    }
+                                </a>
                             </abp-column>
                             <abp-column size-lg="_4" size-md="_4" size-sm="_4">
-                                <div><strong>@item.ProductName</strong></div>
-                                <div>@L["UserOrders:ProductReturnDate"] @order.OrderDate.AddMonths(1).ToString("dd MMMM yyyy")</div>
+                                <a href="/ProductDetail/@item.ProductId.ToString()">
+                                    <div><strong>@item.ProductName</strong></div>
+                                    <div>@L["UserOrders:ProductReturnDate"] @order.OrderDate.AddMonths(1).ToString("dd MMMM yyyy")</div>
+                                </a>
                                 <div class="mt-3">
                                     <abp-button icon="fas fa-cart-plus" class="btn btn-warning buy-again" text="@L["UserOrders:BuyAgain"]" data-product-id="@item.ProductId"></abp-button>
                                 </div>
                             </abp-column>
                             <abp-column offset="_3" size="_2">
                                 <abp-row class="pb-3">
-                                    <span>
-                                        <a class="btn btn-light shadow" href="/ProductDetail/@item.ProductId.ToString()">
-                                            @L["UserOrders:ReturnProducts"]
-                                        </a>
-                                    </span>
+                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">
+                                        @L["UserOrders:ReturnProducts"]
+                                    </abp-button>
                                 </abp-row>
                                 <abp-row>
                                     <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/user-orders/user-order-widget.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/user-orders/user-order-widget.css
index e69de29b..bfa23e93 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/user-orders/user-order-widget.css
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/user-orders/user-order-widget.css
@@ -0,0 +1,4 @@
+a, a:hover, a:visited, a:active {
+    color: inherit;
+    text-decoration: none;
+}