diff --git a/UI/WebServerResources/js/Common/sgRippleClick.directive.js b/UI/WebServerResources/js/Common/sgRippleClick.directive.js
index a695615ff..afb101378 100644
--- a/UI/WebServerResources/js/Common/sgRippleClick.directive.js
+++ b/UI/WebServerResources/js/Common/sgRippleClick.directive.js
@@ -68,7 +68,11 @@
 
         // Register listener
         element.on('click', listener);
-        
+
+        scope.$on('$destroy', function() {
+          element.off('click', listener);
+        });
+
         function listener(event) {
           var coordinates;