diff --git a/src/directives.ts b/src/directives.ts
new file mode 100644
index 0000000..2916745
--- /dev/null
+++ b/src/directives.ts
@@ -0,0 +1,40 @@
+import Vue from 'vue'
+import { randomId } from './lib'
+
+const eventHandlers: { [key: string]: () => void } = {}
+
+Vue.directive('editable', (el, { value, arg }, vnode) => {
+  const keypressHandler = (event: KeyboardEvent) => {
+    console.log('keypress', event.code)
+    // allow line break via Shift + Enter
+    if (event.keyCode === 13 && !event.shiftKey) {
+      event.preventDefault()
+      console.log('edit event on enter', el.innerText)
+      if (!vnode.context) return
+      vnode.context.$emit('edit', { param: arg, value: el.innerText })
+    }
+  }
+
+  const blurHandler = () => {
+    console.log('edit event on blur', el.innerText)
+    if (!vnode.context) return
+    vnode.context.$emit('edit', { param: arg, value: el.innerText })
+  }
+
+  // remove old event listeners
+  if (el.dataset.__evtid) {
+    eventHandlers[el.dataset.__evtid]()
+  }
+
+  el.contentEditable = value ? 'true' : 'false'
+  el.addEventListener('keypress', keypressHandler)
+  el.addEventListener('blur', blurHandler)
+
+  // TODO: is there a better way to avoid multiple event handlers?
+  const id = randomId()
+  el.dataset.__evtid = id
+  eventHandlers[id] = () => {
+    el.removeEventListener('keypress', keypressHandler)
+    el.removeEventListener('blur', blurHandler)
+  }
+})
diff --git a/src/main.ts b/src/main.ts
index 01edb69..45ae4b4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 // import './registerServiceWorker'
+import './directives'
 
 import StorageHandler from './storage'
 
@@ -15,24 +16,6 @@ declare module 'vue/types/vue' {
 Vue.config.productionTip = false
 Vue.prototype.$storage = new StorageHandler()
 
-Vue.directive('editable', (el, { value, arg }, vnode) => {
-  el.contentEditable = value ? 'true' : 'false'
-  el.addEventListener('keypress', event => {
-    // allow line break via Shift + Enter
-    if (event.keyCode === 13 && !event.shiftKey) {
-      event.preventDefault()
-      console.log('edit event on enter', el.innerText)
-      if (!vnode.context) return
-      vnode.context.$emit('edit', { param: arg, value: el.innerText })
-    }
-  })
-  el.addEventListener('blur', () => {
-    console.log('edit event on blur', el.innerText)
-    if (!vnode.context) return
-    vnode.context.$emit('edit', { param: arg, value: el.innerText })
-  })
-})
-
 new Vue({
   router,
   render: h => h(App)