diff --git a/modules/wiki/skins/xe_wiki/header.html b/modules/wiki/skins/xe_wiki/header.html
index df85a449f..9e7ab4e57 100644
--- a/modules/wiki/skins/xe_wiki/header.html
+++ b/modules/wiki/skins/xe_wiki/header.html
@@ -1,4 +1,5 @@
 <!--%import("css/wiki.css")-->
+<!--%import("js/wiki.js")-->
 
 <!--@if(!$module_info->colorset)-->
     {@$module_info->colorset = "white"}
@@ -25,10 +26,9 @@
     <div class="edit"><!--@if($oDocument->isExists())--><a href="{getUrl('act','dispWikiEditPage','entry',$entry)}">Edit</a><!--@end--></div>
     <!--@end-->
     <div class="go">
-        <form action="{getUrl()}" method="get">
-            <input type="hidden" name="mid" value="{$module_info->mid}" />
+        <form action="./" method="get" onsubmit="moveHistory(this); return false;">
             <input type="text" class="inputTypeText w100" name="entry" />
-            <span class="button"><input type="submit" value="Go" /></span>
+            <span calss="button"><input type="submit" value="{$lang->cmd_move}" /></span>
         </form>
     </div>
 </div>
diff --git a/modules/wiki/skins/xe_wiki/histories.html b/modules/wiki/skins/xe_wiki/histories.html
index 2311c278f..2a1b7e59e 100644
--- a/modules/wiki/skins/xe_wiki/histories.html
+++ b/modules/wiki/skins/xe_wiki/histories.html
@@ -31,16 +31,5 @@
 <!--@end-->
 </table>
 </div>
-        <div class="pagination a1">
-            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong> 
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
-        </div>
 
 <!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/js/wiki.js b/modules/wiki/skins/xe_wiki/js/wiki.js
new file mode 100644
index 000000000..ba7a2d364
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/js/wiki.js
@@ -0,0 +1,6 @@
+function moveHistory(fo_obj) {
+    if(!fo_obj.entry.value) return;
+    var url = current_url.setQuery('entry',fo_obj.entry.value);
+    if(typeof(xeVid)!='undefined') url = url.setQuery('vid',xeVid);
+    location.href=url;
+}
diff --git a/modules/wiki/wiki.view.php b/modules/wiki/wiki.view.php
index a304d0f7a..ab5673f40 100644
--- a/modules/wiki/wiki.view.php
+++ b/modules/wiki/wiki.view.php
@@ -51,10 +51,8 @@
             Context::set('entry',$entry);
             $histories = $oDocumentModel->getHistories($document_srl, 10, $page);
             if(!$histories) $histories = array();
-            Context::set('histories',$histories->data);
+            Context::set('histories',$histories);
             Context::set('oDocument', $oDocument);
-            Context::set('page_navigation', $histories->page_navigation);
-            Context::set('page', $histories->page);
             $this->setTemplateFile('histories');
         }