diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f3996c479..df1553db5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,7 @@
   - fixed a bug in My Purchases where in store credit would not be taken into
     account in the overview yielding zero or neagtive transaction amounts on
     the screen. ( Martin Kamerbeek / Oqapi )
+  - fixed #10646: Asset History not paginated
 
 7.7.14
  - fixed #10606: shelf selector
diff --git a/lib/WebGUI/Content/AssetHistory.pm b/lib/WebGUI/Content/AssetHistory.pm
index 7522eee18..e9c3cea14 100644
--- a/lib/WebGUI/Content/AssetHistory.pm
+++ b/lib/WebGUI/Content/AssetHistory.pm
@@ -150,7 +150,9 @@ sub www_view {
     $output .= q|
   <div class="yui-skin-sam">  
     <div id="search"><form id="keywordSearchForm"><input type="text" name="keywords" id="keywordsField" /><input type="submit" value="|.$i18n->get(364, 'WebGUI').q|" /></form></div>
-    <div id="dynamicdata"></div>
+    <div id="paginationTop"></div>
+    <div id="historyData"></div>
+    <div id="paginationBot"></div>
   </div>
 <script type="text/javascript">
     YAHOO.util.Event.onDOMReady( WebGUI.AssetHistory.initManager );
diff --git a/www/extras/yui-webgui/build/assetHistory/assetHistory.js b/www/extras/yui-webgui/build/assetHistory/assetHistory.js
index 33dd31c79..b160421b6 100644
--- a/www/extras/yui-webgui/build/assetHistory/assetHistory.js
+++ b/www/extras/yui-webgui/build/assetHistory/assetHistory.js
@@ -68,7 +68,7 @@ WebGUI.AssetHistory.initManager = function (o) {
 */
 WebGUI.AssetHistory.initDataTable = function (o) {
     var historyPaginator = new YAHOO.widget.Paginator({
-        containers            : ['pagination'],
+        containers            : ['paginationTop', 'paginationBot'],
         pageLinks             : 7,
         rowsPerPage           : 25,
         template              : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}"
@@ -106,7 +106,7 @@ WebGUI.AssetHistory.initDataTable = function (o) {
 
     // Initialize the data table
     WebGUI.AssetHistory.DataTable 
-        = new YAHOO.widget.DataTable( 'dynamicdata', 
+        = new YAHOO.widget.DataTable( 'historyData', 
             WebGUI.AssetHistory.ColumnDefs, 
             WebGUI.AssetHistory.DataSource, 
             {