3 files changed, 20 insertions, 5 deletions

diff --git a/src/MenuItem.mjs b/src/MenuItem.mjs
index 54da450..9218b45 100644
--- a/src/MenuItem.mjs
+++ b/src/MenuItem.mjs
@@ -133,11 +133,6 @@ export const pickLayoutItem = ({ container, layouts }) =>
   new Folder({
     innerHTML: '<span>Layouts<span><span class="info">(x)</span>',
     items: [
-      new Item({
-        text: 'EDIT',
-        onclick: () =>
-          container.closest('[data-mode]').setAttribute('data-mode', 'editing')
-      }),
       ...layouts.map(
         layout =>
           new Item({
diff --git a/src/dumbymap.mjs b/src/dumbymap.mjs
index 8f049b2..a31274e 100644
--- a/src/dumbymap.mjs
+++ b/src/dumbymap.mjs
@@ -465,6 +465,8 @@ export const generateMaps = (container, { delay } = {}) => {
     }
 
     shiftByWindow(menu)
+
+    return menu
   }
 
   // Remove menu when click outside
diff --git a/src/editor.mjs b/src/editor.mjs
index 90c446e..9bb62a9 100644
--- a/src/editor.mjs
+++ b/src/editor.mjs
@@ -4,6 +4,7 @@ import { markdown2HTML, generateMaps } from './dumbymap'
 import { defaultAliases, parseConfigsFromYaml } from 'mapclay'
 import * as menuItem from './MenuItem'
 import { shiftByWindow } from './utils.mjs'
+import { Item } from './MenuItem.mjs'
 
 // Set up Containers {{{
 
@@ -333,6 +334,23 @@ const updateDumbyMap = () => {
 
   const htmlHolder = dumbymap.htmlHolder
   htmlHolder.onscroll = htmlOnScroll(htmlHolder)
+
+  const dumbymenu = dumbyContainer.oncontextmenu
+  dumbyContainer.oncontextmenu = e => {
+    const menu = dumbymenu(e)
+
+    if (context.dataset.mode !== 'editing') {
+      menu.appendChild(
+        new Item({
+          innerHTML: '<strong>EDIT</strong>',
+          onclick: () => context.dataset.mode = 'editing'
+        })
+      )
+    }
+
+    menu.style.transform = ''
+    shiftByWindow(menu)
+  }
 }
 updateDumbyMap()