diff --git a/src/components/wpt/Wpt.tsx b/src/components/wpt/Wpt.tsx
index e5d2ff2..c21812f 100644
--- a/src/components/wpt/Wpt.tsx
+++ b/src/components/wpt/Wpt.tsx
@@ -1,13 +1,9 @@
-import { Component, createEffect, createSignal, onCleanup } from 'solid-js';
+import { Component, createEffect, onCleanup } from 'solid-js';
 
-import dispatch, { cancelDispatch } from '../../workers/dispatcher-main';
 import VectorSource from 'ol/source/Vector';
 import GeoJSON from 'ol/format/GeoJSON';
 import { useI18n } from '@solid-primitives/i18n';
 import { cloneDeep } from 'lodash';
-import Dialog from '../dialog';
-import { Box, Button, Stack, TextField } from '@suid/material';
-import wpt from '.';
 import {
   createCachedSignal,
   destroyCachedSignal,
@@ -19,11 +15,6 @@ interface Props {
   context: any;
 }
 
-enum Mode {
-  CLOSED,
-  EDIT,
-}
-
 export const Wpt: Component<Props> = ({
   vectorSource,
   wptId: wptId,
@@ -48,8 +39,6 @@ export const Wpt: Component<Props> = ({
     destroyCachedSignal(params);
   });
 
-  const [editedWpt, setEditedWpt] = createSignal<Wpt>();
-
   const getTitle = () => {
     if (wpt()?.name) {
       return `${wpt()?.name} (${t('wpt')})`;
@@ -57,13 +46,6 @@ export const Wpt: Component<Props> = ({
     return t('wpt');
   };
 
-  const [mode, setMode] = createSignal<Mode>(Mode.CLOSED);
-
-  const edit = () => {
-    setMode(Mode.EDIT);
-    setEditedWpt(cloneDeep(wpt()));
-  };
-
   createEffect(() => {
     console.log({ caller: 'Wpt', vectorSource, wptId, wpt: cloneDeep(wpt()) });
 
@@ -86,7 +68,6 @@ export const Wpt: Component<Props> = ({
               ...wpt(),
               id: wptId,
               getTitle,
-              edit,
               context: { ...context, wpt, wptId },
             },
             id: wptId,
@@ -104,66 +85,7 @@ export const Wpt: Component<Props> = ({
     }
   });
 
-  const closeHandler = () => {
-    setMode(Mode.CLOSED);
-  };
-
-  const saveHandler = () => {
-    console.log({
-      caller: 'Wpt / saveHandler',
-      wptId,
-      editedWpt: editedWpt(),
-    });
-    dispatch({ action: 'putWpt', params: { id: wptId, wpt: editedWpt() } });
-    setMode(Mode.CLOSED);
-  };
-
-  return (
-    <Dialog
-      open={mode() === Mode.EDIT}
-      title={getTitle()}
-      closeHandler={closeHandler}
-    >
-      <Box sx={{ flexGrow: 1, padding: '10px' }}>
-        <div>
-          <TextField
-            required
-            label={t('name')}
-            defaultValue={wpt()?.name}
-            onChange={(event: any, value: string) => {
-              setEditedWpt({ ...editedWpt(), name: value });
-            }}
-          />
-          <TextField
-            label={t('sym')}
-            defaultValue={wpt()?.sym}
-            onChange={(event: any, value: string) => {
-              setEditedWpt({ ...editedWpt(), sym: value });
-            }}
-          />
-          <TextField
-            label={t('minZoom')}
-            defaultValue={wpt()?.extensions?.['dyo:minZoom']?.toString()}
-            onChange={(event: any, value: string) => {
-              const extensions = {
-                ...editedWpt()?.extensions,
-                'dyo:minZoom': parseFloat(value),
-              };
-              setEditedWpt({ ...editedWpt(), extensions });
-            }}
-          />
-          <Stack spacing={2} direction='row' sx={{ marginTop: '20px' }}>
-            <Button variant='outlined' color='secondary' onClick={closeHandler}>
-              {t('cancel')}
-            </Button>
-            <Button variant='contained' color='success' onClick={saveHandler}>
-              {t('save')}
-            </Button>
-          </Stack>
-        </div>
-      </Box>
-    </Dialog>
-  );
+  return <></>;
 };
 
 export default Wpt;
diff --git a/src/components/wpt/WptEditor.tsx b/src/components/wpt/WptEditor.tsx
new file mode 100644
index 0000000..ce5cd5f
--- /dev/null
+++ b/src/components/wpt/WptEditor.tsx
@@ -0,0 +1,120 @@
+import { useI18n } from '@solid-primitives/i18n';
+import {
+  Dialog,
+  Box,
+  TextField,
+  Stack,
+  Button,
+  IconButton,
+} from '@suid/material';
+import { cloneDeep } from 'lodash';
+import { Component, createSignal } from 'solid-js';
+import { emptyWpt } from '../../db/wpt';
+import { peekCachedSignal } from '../../workers/cached-signals';
+import dispatch from '../../workers/dispatcher-main';
+import EditIcon from '@suid/icons-material/Edit';
+
+enum Mode {
+  CLOSED,
+  EDIT,
+}
+
+interface Props {
+  wptId?: string;
+}
+
+const WptEditor: Component<Props> = ({ wptId }) => {
+  const [mode, setMode] = createSignal<Mode>(Mode.CLOSED);
+  const [editedWpt, setEditedWpt] = createSignal<Wpt>();
+
+  const [t, { add, locale, dict }] = useI18n();
+
+  const wpt =
+    wptId !== undefined
+      ? peekCachedSignal({ id: wptId, method: 'getWpt' })
+      : () => emptyWpt;
+
+  const edit = () => {
+    setMode(Mode.EDIT);
+    setEditedWpt(cloneDeep(wpt()));
+  };
+
+  const closeHandler = () => {
+    setMode(Mode.CLOSED);
+  };
+
+  const saveHandler = () => {
+    console.log({
+      caller: 'Wpt / saveHandler',
+      wptId,
+      editedWpt: editedWpt(),
+    });
+    dispatch({ action: 'putWpt', params: { id: wptId, wpt: editedWpt() } });
+    setMode(Mode.CLOSED);
+  };
+
+  const getTitle = () => {
+    if (wpt()?.name) {
+      return `${wpt()?.name} (${t('wpt')})`;
+    }
+    return t('wpt');
+  };
+
+  return (
+    <>
+      <IconButton onClick={edit}>
+        <EditIcon />
+      </IconButton>
+      <Dialog
+        open={mode() === Mode.EDIT}
+        title={getTitle()}
+        closeHandler={closeHandler}
+      >
+        <Box sx={{ flexGrow: 1, padding: '10px' }}>
+          <div>
+            <TextField
+              required
+              label={t('name')}
+              defaultValue={wpt()?.name}
+              onChange={(event: any, value: string) => {
+                setEditedWpt({ ...editedWpt(), name: value });
+              }}
+            />
+            <TextField
+              label={t('sym')}
+              defaultValue={wpt()?.sym}
+              onChange={(event: any, value: string) => {
+                setEditedWpt({ ...editedWpt(), sym: value });
+              }}
+            />
+            <TextField
+              label={t('minZoom')}
+              defaultValue={wpt()?.extensions?.['dyo:minZoom']?.toString()}
+              onChange={(event: any, value: string) => {
+                const extensions = {
+                  ...editedWpt()?.extensions,
+                  'dyo:minZoom': parseFloat(value),
+                };
+                setEditedWpt({ ...editedWpt(), extensions });
+              }}
+            />
+            <Stack spacing={2} direction='row' sx={{ marginTop: '20px' }}>
+              <Button
+                variant='outlined'
+                color='secondary'
+                onClick={closeHandler}
+              >
+                {t('cancel')}
+              </Button>
+              <Button variant='contained' color='success' onClick={saveHandler}>
+                {t('save')}
+              </Button>
+            </Stack>
+          </div>
+        </Box>
+      </Dialog>
+    </>
+  );
+};
+
+export default WptEditor;
diff --git a/src/components/wpt/WptViewer.tsx b/src/components/wpt/WptViewer.tsx
index 888d73a..b358c21 100644
--- a/src/components/wpt/WptViewer.tsx
+++ b/src/components/wpt/WptViewer.tsx
@@ -2,6 +2,8 @@ import { Component } from 'solid-js';
 import WptIcon from '../../icons/location-pin-svgrepo-com.svg?component-solid';
 import { peekCachedSignal } from '../../workers/cached-signals';
 import Tree from '../tree';
+import { IconButton } from '@suid/material';
+import WptEditor from './WptEditor';
 
 interface Props {
   wptId: string;
@@ -18,7 +20,9 @@ const WptViewer: Component<Props> = ({ wptId }) => {
     <Tree
       title={
         <>
-          <WptIcon fill='black' width="24" height="24" viewBox="0 0 300 300" /> {title()}
+          <WptIcon fill='black' width='24' height='24' viewBox='0 0 300 300' />
+          {title()}
+          <WptEditor wptId={wptId} />
         </>
       }
       content={undefined}
diff --git a/src/components/wpt/index.ts b/src/components/wpt/index.ts
index 10fc84c..8387af6 100644
--- a/src/components/wpt/index.ts
+++ b/src/components/wpt/index.ts
@@ -1,3 +1,4 @@
 export { default } from './Wpt';
 
 export { default as WptViewer } from './WptViewer';
+export { default as WptEditor } from './WptEditor';