diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 99d6726d..d27575a6 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -153,7 +153,7 @@ export default {
     });
 
     this.$gzevent.$on("context-click", function(key) {
-      alert("context click: " + key);
+      alert("App.vue::context click: " + key);
     });
 
     //redirect to login if not authenticated
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index 1fd37591..d2a22424 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -130,7 +130,9 @@
 
 <script>
 /*  xeslint-disable    */
-
+function clickHandler(key) {
+  alert("inventory-widget-edit.vue::context click: " + key);
+}
 export default {
   beforeCreate() {
     //Cache all required lt keys
@@ -176,8 +178,12 @@ export default {
       icon: "fa-splotch",
       title: this.$gzlocale.get("Widget")
     });
+    this.$gzevent.$on("context-click", clickHandler);
     this.getDataFromApi();
   },
+  beforeDestroy() {
+    this.$gzevent.$off("context-click", clickHandler);
+  },
   components: {},
   data() {
     return {