diff --git a/Packages/lesiontracker/compatibility/lesionTool.js b/Packages/lesiontracker/compatibility/lesionTool.js
index 389091db9..8b6b3b62b 100644
--- a/Packages/lesiontracker/compatibility/lesionTool.js
+++ b/Packages/lesiontracker/compatibility/lesionTool.js
@@ -15,13 +15,26 @@ var cornerstoneTools = (function ($, cornerstone, cornerstoneMath, cornerstoneTo
         var element = mouseEventData.element;
         var lesionCounter = "";
 
-        //setting name of lesion
-        $(element).on("LesionNameSet", function(e,counter){
-            lesionCounter = counter;
+        // Subscribe CornerstoneMouseup event, when mouse is up, call lesionDialog
+        $(element).on("CornerstoneToolsMouseUp", function (e) {
+
+            // Unsubscribe CornerstoneToolsMouseUp event
+            $(element).off("CornerstoneToolsMouseUp");
+
+            // Show LesionDialog
+            $(document).trigger("ShowLesionDialog", e);
+
         });
 
-        //Listens LesionToolModified event and calls measurementModified function when lesion measurement is changed or updated.
+        // Set Lesion Name
+        $(element).on("LesionNameSet", function(e,lesionName){
+            lesionCounter = lesionName;
+        });
+
+        // Subscribe LesionToolModified and calls measurementModified function when lesion measurement is changed or updated.
         $(element).on("LesionToolModified", measurementModified);
+
+        // Subscribe LesionMeasurementCreated
         $(element).trigger("LesionMeasurementCreated");
 
         // create the measurement data for this tool with the end handle activated
diff --git a/Packages/lesiontracker/components/lesionDialog/lesionDialog.js b/Packages/lesiontracker/components/lesionDialog/lesionDialog.js
index 7ba96b385..0d16ac861 100644
--- a/Packages/lesiontracker/components/lesionDialog/lesionDialog.js
+++ b/Packages/lesiontracker/components/lesionDialog/lesionDialog.js
@@ -1,31 +1,46 @@
 Template.lesionDialog.onRendered(function () {
-    // Listen lesionMeaurementCreated Event and when this event is triggered, show lesionLocationDialog Box
-    $(document).on("lesionMeasurementCreated",function(e,eventCaller,data){
-        var element  = data.element;
-        var tabId = data.tabId;
-        var viewports = $("#content"+tabId).find(".imageViewerViewport");
-        var viewportIndex = $(viewports).index($(element));
-        data.viewportIndex = viewportIndex;
-        data.totalViewportCount = viewports.length;
+    // Show Lesion Dialog
+    $(document).on("ShowLesionDialog", function (e, eventData) {
+        var dialogPointsOnPage = eventData.currentPoints.page;
+        $("#modal-dialog-container").css({
+            "top": dialogPointsOnPage.y,
+            "left": dialogPointsOnPage.x
+        });
 
-        //Set Lesion Table Data to insert into lesion table
-        setLesionTableData(data);
-
-        // Check popup will shown or not
-        var returnVal = lesionNumberIsAdded(data);
-        if(!returnVal.isFound) {
-            if( !Session.get("lesionLocationSelected") ) {
-                $("#modal-dialog-container").css({
-                    "top": eventCaller.pageY,
-                    "left": eventCaller.pageX
-                });
-
-                $("#lesionDialog").modal("show");
-            }
-        } else {
-            // If lesionNumber is added before:
-            data.rowIndex = returnVal.rowIndex;
-            $(document).trigger("addLesionToExistedRow",data);
-        }
+        $("#lesionDialog").modal("show");
     });
-});
\ No newline at end of file
+});
+
+
+
+// Listen lesionMeaurementCreated Event and when this event is triggered, show lesionLocationDialog Box
+/*
+ $(document).on("lesionMeasurementCreated",function(e,eventCaller,data){
+ console.log("Lesion measurement xreated");
+ var element  = data.element;
+ var tabId = data.tabId;
+ var viewports = $("#content"+tabId).find(".imageViewerViewport");
+ var viewportIndex = $(viewports).index($(element));
+ data.viewportIndex = viewportIndex;
+ data.totalViewportCount = viewports.length;
+
+ //Set Lesion Table Data to insert into lesion table
+ setLesionTableData(data);
+
+ // Check popup will shown or not
+ var returnVal = lesionNumberIsAdded(data);
+ if(!returnVal.isFound) {
+ if( !Session.get("lesionLocationSelected") ) {
+ $("#modal-dialog-container").css({
+ "top": eventCaller.pageY,
+ "left": eventCaller.pageX
+ });
+
+ $("#lesionDialog").modal("show");
+ }
+ } else {
+ // If lesionNumber is added before:
+ data.rowIndex = returnVal.rowIndex;
+ $(document).trigger("addLesionToExistedRow",data);
+ }
+ });*/