diff --git a/modules/ui/improveOSM_details.js b/modules/ui/improveOSM_details.js
index 2627eb479..9e5b43080 100644
--- a/modules/ui/improveOSM_details.js
+++ b/modules/ui/improveOSM_details.js
@@ -6,7 +6,7 @@ import {
 import { dataEn } from '../../data';
 import { modeSelect } from '../modes/select';
 import { t } from '../util/locale';
-import { utilDisplayName, utilEntityOrMemberSelector, utilEntityRoot } from '../util';
+import { utilDisplayName, utilHighlightEntities, utilEntityRoot } from '../util';
 
 export function uiImproveOsmDetails(context) {
   let _qaItem;
@@ -76,15 +76,16 @@ export function uiImproveOsmDetails(context) {
         // Add click handler
         link
           .on('mouseenter', () => {
-            context.surface().selectAll(utilEntityOrMemberSelector([entityID], context.graph()))
-              .classed('hover', true);
+            utilHighlightEntities([entityID], true, context);
           })
           .on('mouseleave', () => {
-            context.surface().selectAll('.hover')
-              .classed('hover', false);
+            utilHighlightEntities([entityID], false, context);
           })
           .on('click', () => {
             d3_event.preventDefault();
+
+            utilHighlightEntities([entityID], false, context);
+
             const osmlayer = context.layers().layer('osm');
             if (!osmlayer.enabled()) {
               osmlayer.enabled(true);
diff --git a/modules/ui/keepRight_details.js b/modules/ui/keepRight_details.js
index a34ad6483..007c6fa42 100644
--- a/modules/ui/keepRight_details.js
+++ b/modules/ui/keepRight_details.js
@@ -6,7 +6,7 @@ import {
 import { dataEn } from '../../data';
 import { modeSelect } from '../modes/select';
 import { t } from '../util/locale';
-import { utilDisplayName, utilEntityOrMemberSelector, utilEntityRoot } from '../util';
+import { utilDisplayName, utilHighlightEntities, utilEntityRoot } from '../util';
 
 export function uiKeepRightDetails(context) {
   let _qaItem;
@@ -75,15 +75,16 @@ export function uiKeepRightDetails(context) {
         // Add click handler
         link
           .on('mouseenter', () => {
-            context.surface().selectAll(utilEntityOrMemberSelector([entityID], context.graph()))
-              .classed('hover', true);
+            utilHighlightEntities([entityID], true, context);
           })
           .on('mouseleave', () => {
-            context.surface().selectAll('.hover')
-              .classed('hover', false);
+            utilHighlightEntities([entityID], false, context);
           })
           .on('click', () => {
             d3_event.preventDefault();
+
+            utilHighlightEntities([entityID], false, context);
+
             const osmlayer = context.layers().layer('osm');
             if (!osmlayer.enabled()) {
               osmlayer.enabled(true);
diff --git a/modules/ui/osmose_details.js b/modules/ui/osmose_details.js
index 78a7be570..f40a655a0 100644
--- a/modules/ui/osmose_details.js
+++ b/modules/ui/osmose_details.js
@@ -7,7 +7,7 @@ import {
 import { modeSelect } from '../modes/select';
 import { t } from '../util/locale';
 import { services } from '../services';
-import { utilDisplayName, utilEntityOrMemberSelector } from '../util';
+import { utilDisplayName, utilHighlightEntities } from '../util';
 
 
 export function uiOsmoseDetails(context) {
@@ -151,15 +151,16 @@ export function uiOsmoseDetails(context) {
               // Add click handler
               link
                 .on('mouseenter', () => {
-                  context.surface().selectAll(utilEntityOrMemberSelector([entityID], context.graph()))
-                    .classed('hover', true);
+                  utilHighlightEntities([entityID], true, context);
                 })
                 .on('mouseleave', () => {
-                  context.surface().selectAll('.hover')
-                    .classed('hover', false);
+                  utilHighlightEntities([entityID], false, context);
                 })
                 .on('click', () => {
                   d3_event.preventDefault();
+
+                  utilHighlightEntities([entityID], false, context);
+
                   const osmlayer = context.layers().layer('osm');
                   if (!osmlayer.enabled()) {
                     osmlayer.enabled(true);