diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs
index 8c63a71af5..8015100cbc 100644
--- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs
+++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs
@@ -61,7 +61,7 @@ namespace Volo.Docs
                 options.Conventions.AddPageRoute("/Documents/Project/Index", routePrefix + "{projectName}");
                 options.Conventions.AddPageRoute("/Documents/Project/Index", routePrefix + "{languageCode}/{projectName}");
                 options.Conventions.AddPageRoute("/Documents/Project/Index", routePrefix + "{languageCode}/{projectName}/{version}/{*documentName}");
-                options.Conventions.AddPageRoute("/Documents/Search", routePrefix + "search/{languageCode}/{projectName}/{version}/{*keyword}");
+                options.Conventions.AddPageRoute("/Documents/Search", routePrefix + "search/{languageCode}/{projectName}/{version}");
             });
 
             context.Services.AddAutoMapperObjectMapper<DocsWebModule>();
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
index 88ab199f2e..69cfa371d8 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
@@ -83,7 +83,7 @@
 
             $('#fullsearch').keyup(function (e) {
                 if (e.key === 'Enter') {
-                    window.open($(this).data('fullsearch-url') + this.value);
+                    window.open($(this).data('fullsearch-url') + "?keyword=" + encodeURIComponent(this.value));
                 }
             });
         };