diff --git a/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js b/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js
index 41ea67a0db..12654abe5f 100644
--- a/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js
+++ b/src/plugins/AngleMeasurementsPlugin/AngleMeasurement.js
@@ -125,7 +125,7 @@ class AngleMeasurement extends Component {
 
         this._angleVisible = false;
         this._labelsVisible = false;
-        this._clickable = true;
+        this._clickable = false;
 
         this._originMarker.on("worldPos", (value) => {
             this._originWorld.set(value || [0, 0, 0]);
diff --git a/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.js b/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.js
index 0b9aad727d..2a88ec75d5 100644
--- a/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.js
+++ b/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.js
@@ -232,6 +232,7 @@ class AngleMeasurementsPlugin extends Plugin {
         this._onMouseOver = (event, measurement) => {
             this.fire("mouseOver", {
                 plugin: this,
+                angleMeasurement: measurement,
                 measurement,
                 event
             });
@@ -240,6 +241,7 @@ class AngleMeasurementsPlugin extends Plugin {
         this._onMouseLeave = (event, measurement) => {
             this.fire("mouseLeave", {
                 plugin: this,
+                angleMeasurement: measurement,
                 measurement,
                 event
             });
@@ -248,6 +250,7 @@ class AngleMeasurementsPlugin extends Plugin {
         this._onContextMenu = (event, measurement) => {
             this.fire("contextMenu", {
                 plugin: this,
+                angleMeasurement: measurement,
                 measurement,
                 event
             });
diff --git a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js
index 2469bc264a..1cf7f02384 100644
--- a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js
+++ b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js
@@ -182,7 +182,7 @@ class DistanceMeasurement extends Component {
         this._zAxisVisible = false;
         this._axisEnabled = true;
         this._labelsVisible = false;
-        this._clickable = true;
+        this._clickable = false;
 
         this._originMarker.on("worldPos", (value) => {
             this._originWorld.set(value || [0, 0, 0]);
@@ -291,10 +291,10 @@ class DistanceMeasurement extends Component {
 
         if (vpz1 > near || vpz2 > near) {
 
-            this._xAxisLabel.setVisible(false);
-            this._yAxisLabel.setVisible(false);
-            this._zAxisLabel.setVisible(false);
-            this._lengthLabel.setVisible(false);
+            this._xAxisLabel.setCulled(true);
+            this._yAxisLabel.setCulled(true);
+            this._zAxisLabel.setCulled(true);
+            this._lengthLabel.setCulled(true);
 
             this._xAxisWire.setVisible(false);
             this._yAxisWire.setVisible(false);
@@ -398,6 +398,11 @@ class DistanceMeasurement extends Component {
                 }
             }
 
+            // this._xAxisLabel.setVisible(this.axisVisible && this.xAxisVisible);
+            // this._yAxisLabel.setVisible(this.axisVisible && this.yAxisVisible);
+            // this._zAxisLabel.setVisible(this.axisVisible && this.zAxisVisible);
+           // this._lengthLabel.setVisible(false);
+
             this._originDot.setVisible(this._visible && this._originVisible);
             this._targetDot.setVisible(this._visible && this._targetVisible);
 
diff --git a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsPlugin.js b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsPlugin.js
index f140467bc9..0337041672 100644
--- a/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsPlugin.js
+++ b/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsPlugin.js
@@ -254,6 +254,7 @@ class DistanceMeasurementsPlugin extends Plugin {
         this._onMouseOver = (event, measurement) => {
             this.fire("mouseOver", {
                 plugin: this,
+                distanceMeasurement: measurement,
                 measurement,
                 event
             });
@@ -262,6 +263,7 @@ class DistanceMeasurementsPlugin extends Plugin {
         this._onMouseLeave = (event, measurement) => {
             this.fire("mouseLeave", {
                 plugin: this,
+                distanceMeasurement: measurement,
                 measurement,
                 event
             });
@@ -270,6 +272,7 @@ class DistanceMeasurementsPlugin extends Plugin {
         this._onContextMenu = (event, measurement) => {
             this.fire("contextMenu", {
                 plugin: this,
+                distanceMeasurement: measurement,
                 measurement,
                 event
             });
diff --git a/src/plugins/lib/html/Dot.js b/src/plugins/lib/html/Dot.js
index 1f6fe0603d..951af59080 100644
--- a/src/plugins/lib/html/Dot.js
+++ b/src/plugins/lib/html/Dot.js
@@ -29,7 +29,7 @@ class Dot {
         dotStyle.left = 0 + "px";
         dotStyle["box-shadow"] = "0 2px 5px 0 #182A3D;";
         dotStyle["opacity"] = 1.0;
-        dotStyle["pointer-events"] = "none";
+        dotStyle["pointer-events"] = "all";
         if (cfg.onContextMenu) {
      //       dotStyle["cursor"] = "context-menu";
         }