diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 5b69f1e06..c6269a92e 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -856,12 +856,12 @@
                         case 'mid' : $query = $get_vars['mid']; break;
                         case 'document_srl' : $query = $get_vars['document_srl']; break;
                         case 'document_srl.mid' : $query = $get_vars['mid'].'/'.$get_vars['document_srl']; break;
-                        case 'entry.mid' : $query = $get_vars['mid'].'/'.$get_vars['entry']; break;
+                        case 'entry.mid' : $query = $get_vars['mid'].'/entry/'.$get_vars['entry']; break;
                         case 'act.document_srl.key' : $query = $get_vars['act']=='trackback'?$get_vars['document_srl'].'/'.$get_vars['key'].'/'.$get_vars['act']:''; break;
                         case 'mid.vid' : $query = $get_vars['vid'].'/'.$get_vars['mid']; break;
                         case 'document_srl.vid' : $query = $get_vars['vid'].'/'.$get_vars['document_srl']; break;
                         case 'document_srl.mid.vid' : $query = $get_vars['vid'].'/'.$get_vars['mid'].'/'.$get_vars['document_srl']; break;
-                        case 'entry.mid.vid' : $query = $get_vars['vid'].'/'.$get_vars['mid'].'/'.$get_vars['entry']; break;
+                        case 'entry.mid.vid' : $query = $get_vars['vid'].'/'.$get_vars['mid'].'/entry/'.$get_vars['entry']; break;
                         case 'act.document_srl.key.vid' : $query = $get_vars['act']=='trackback'?$get_vars['vid'].'/'.$get_vars['document_srl'].'/'.$get_vars['key'].'/'.$get_vars['act']:''; break;
                     }
                 }
diff --git a/modules/wiki/skins/xe_wiki/title_index.html b/modules/wiki/skins/xe_wiki/title_index.html
index 742e7c58b..482f346a3 100644
--- a/modules/wiki/skins/xe_wiki/title_index.html
+++ b/modules/wiki/skins/xe_wiki/title_index.html
@@ -9,7 +9,7 @@
     <!--@foreach($document_list as $val)-->
     <tr>
     <td>
-        <a href="{getUrl('','mid',$module_info->mid,'entry',$val->get('title'))}">{$val->get('title')}</a>
+        <a href="{getUrl('','mid',$mid,'entry',$val->get('title'))}">{$val->get('title')}</a>
     </td>
     </tr>
     <!--@end-->