diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8e0821eda..e9cf324fc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.8.0
+ - fixed #10856: no paginate in wiki keyword search 
  - fixed #10877: getProfileUrl() broken
  - fixed #10844: Ad Sales: No template variable Help
  - fixed #10873: Code editor breaks CSS comments
diff --git a/docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg b/docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg
new file mode 100644
index 000000000..f43b3475f
Binary files /dev/null and b/docs/upgrades/packages-7.7.20/wiki-master-by-keyword-template.tmpl.wgpkg differ
diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
index cf983a540..6fb0b6385 100644
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@@ -542,7 +542,7 @@ sub www_byKeyword {
         keyword         => $keyword,   
         usePaginator    => 1,
         });
-    $p->setBaseUrl($self->getUrl("func=byKeyword"));
+    $p->setBaseUrl($self->getUrl("func=byKeyword;keyword=".$keyword));
     foreach my $assetData (@{$p->getPageData}) {
         my $asset = WebGUI::Asset->newByDynamicClass($self->session, $assetData->{assetId});
         next unless defined $asset;