diff --git a/src/com/lushprojects/circuitjs1/client/CirSim.java b/src/com/lushprojects/circuitjs1/client/CirSim.java
index e64c2b75..7d817bb6 100644
--- a/src/com/lushprojects/circuitjs1/client/CirSim.java
+++ b/src/com/lushprojects/circuitjs1/client/CirSim.java
@@ -4178,6 +4178,16 @@ MouseOutHandler, MouseWheelHandler {
     	}
     }
 
+    boolean matchesMouseElm(CircuitElm ce) {
+	if (mouseElm == null)
+	    return false;
+	if (ce instanceof LabeledNodeElm && mouseElm instanceof LabeledNodeElm &&
+		ce.getNode(0) == mouseElm.getNode(0)) {
+	    return true;
+	}
+	return false;
+    }
+    
     void removeZeroLengthElements() {
     	int i;
     	boolean changed = false;
diff --git a/src/com/lushprojects/circuitjs1/client/CircuitElm.java b/src/com/lushprojects/circuitjs1/client/CircuitElm.java
index b5797c1d..c5699ad3 100644
--- a/src/com/lushprojects/circuitjs1/client/CircuitElm.java
+++ b/src/com/lushprojects/circuitjs1/client/CircuitElm.java
@@ -988,7 +988,7 @@ public abstract class CircuitElm implements Editable {
 	return ((x1 == y1 && x2 == y2) || (x1 == y2 && x2 == y1));
     }
     boolean needsHighlight() { 
-	return mouseElmRef==this || selected || sim.plotYElm == this ||
+	return mouseElmRef==this || selected || sim.plotYElm == this || sim.matchesMouseElm(this) ||
 		// Test if the current mouseElm is a ScopeElm and, if so, does it belong to this elm
 		(mouseElmRef instanceof ScopeElm && ((ScopeElm) mouseElmRef).elmScope.getElm()==this); 
     }