diff --git a/frontend/src/Components/MarkdownEditor.svelte b/frontend/src/Components/MarkdownEditor.svelte
index 8f347ef..c3f086d 100644
--- a/frontend/src/Components/MarkdownEditor.svelte
+++ b/frontend/src/Components/MarkdownEditor.svelte
@@ -76,6 +76,7 @@
     function oncontextmenu(evt){
          evt.preventDefault();
          evt.stopPropagation();
+         startEdit();
          return false;
     }
 
@@ -121,8 +122,9 @@
 {#if editing}
     <div class="boundary">
         <textarea bind:value={editValue.source} onkeyup={typed} autofocus={!simple}></textarea>
+        <button class="cancel" onclick={e => editing = false}>{t('cancel')}</button>
         <button class="save" onclick={doSave}>{t('save')}</button>
     </div>
 {/if}
-<svelte:element this={type} {onmousedown} {onmouseup} {ontouchstart} {ontouchend} {oncontextmenu} class={{editable}} title={t('long_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
+    <svelte:element this={type} {onclick} {oncontextmenu} class={{editable}} title={t('long_click_to_edit')} >{@html target(editValue.rendered)}</svelte:element>
 </div>
\ No newline at end of file
diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css
index c7ed600..3d7b9f3 100644
--- a/web/src/main/resources/web/css/default.css
+++ b/web/src/main/resources/web/css/default.css
@@ -389,4 +389,8 @@ table{
 
 .wiki.page h2{
     display: inline-block;
+}
+
+a.wikilink{
+    display: block;
 }
\ No newline at end of file