Index: E:/workspace/fluid-components/src/webapp/components/pager/js/Pager.js =================================================================== --- E:/workspace/fluid-components/src/webapp/components/pager/js/Pager.js (revision 7257) +++ E:/workspace/fluid-components/src/webapp/components/pager/js/Pager.js (working copy) @@ -147,6 +147,7 @@ } : { ID: page === current? "page-link:link": "page-link:link", + localID: page + 1, value: page + 1, pageIndex: page, decorators: [ Index: E:/workspace/fluid-components/src/webapp/framework/renderer/js/fluidRenderer.js =================================================================== --- E:/workspace/fluid-components/src/webapp/framework/renderer/js/fluidRenderer.js (revision 7257) +++ E:/workspace/fluid-components/src/webapp/framework/renderer/js/fluidRenderer.js (working copy) @@ -1373,7 +1373,10 @@ } processDecoratorQueue(); if (lastId) { - fluid.jById(lastId).focus(); + var element = fluid.byId(lastId); + if (element) { + $(element).focus(); + } } return templates; };