diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 550b608..9596275 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -33,6 +33,7 @@
     import ViewPrj     from "./routes/project/View.svelte";
     import ViewTask    from "./routes/task/View.svelte";
     import WikiIndex   from "./routes/wiki/Index.svelte";
+    import WikiPage    from "./routes/wiki/View.svelte"
 
     let translations_ready = $state(false);
 
@@ -89,6 +90,7 @@
         <Route path="/user/oidc/add"               component={EditService} />
         <Route path="/user/oidc/edit/:serviceName" component={EditService} />
         <Route path="/wiki"                        component={WikiIndex} />
+        <Route path="/wiki/:id/view"               component={WikiPage} />
         <Route>
             Not found!
         </Route>
diff --git a/frontend/src/routes/wiki/Index.svelte b/frontend/src/routes/wiki/Index.svelte
index b56896d..96379ea 100644
--- a/frontend/src/routes/wiki/Index.svelte
+++ b/frontend/src/routes/wiki/Index.svelte
@@ -1,11 +1,20 @@
 <script>
     import { onMount }  from 'svelte';
+    import { useTinyRouter } from 'svelte-tiny-router';
     import { api }      from '../../urls.svelte';
     import { t }        from '../../translations.svelte';
 
-    let error = $state(null);
-    let pages = $state(null);
+    let error      = $state(null);
     let lastLetter = null;
+    let pages      = $state(null);
+    let router     = useTinyRouter();
+
+    function onclick(e){
+        e.preventDefault();
+        let href = e.target.getAttribute('href');
+        if (href) router.navigate(href);
+        return false;
+    }
 
     async function loadPageList(){
         const url = api('wiki');
@@ -30,8 +39,6 @@
 
 <h2>{lastLetter = page.charAt(0).toUpperCase()||page.charAt(0).toUpperCase()}</h2>
 {/if}
-<div>
-<a href={`/wiki/${page}/view`}>{page}</a>
-</div>
+<a class="wikilink" href={`/wiki/${page}/view`} {onclick} >{page}</a>
 {/each}
 {/if}
\ No newline at end of file
diff --git a/frontend/src/routes/wiki/View.svelte b/frontend/src/routes/wiki/View.svelte
new file mode 100644
index 0000000..a13b288
--- /dev/null
+++ b/frontend/src/routes/wiki/View.svelte
@@ -0,0 +1,28 @@
+<script>
+    import { onMount } from 'svelte';
+    import { api }     from '../../urls.svelte';
+    import { t }       from '../../translations.svelte';
+
+    import Editor      from '../../Components/MarkdownEditor.svelte';
+
+    let error = $state(null);
+    let { id } = $props();
+    let page = $state(null);
+
+    async function loadPage(){
+        const url = api(`wiki/page/${id}`);
+        const res = await fetch(url,{credentials:'include'});
+        if (res.ok){
+            page  = await res.json();
+            error = null;
+        } else {
+            error = await res.text();
+        }
+    }
+
+    onMount(loadPage);
+</script>
+<h2>{id}</h2>
+{#if error}
+<span class="error">{error}</span>
+{/if}
\ No newline at end of file