diff --git a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
index 3fd2e8a5cd..9abd56e378 100644
--- a/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
+++ b/Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
@@ -1119,7 +1119,7 @@ public class DefaultGraphDisplay implements GraphDisplay {
 		}
 
 		graphMouse = new JgtPluggableGraphMouse(this);
-		viewer.setGraphMouse(graphMouse);
+		vv.setGraphMouse(graphMouse);
 
 		return vv;
 	}
@@ -1144,7 +1144,7 @@ public class DefaultGraphDisplay implements GraphDisplay {
 			// vertices
 			if (e.getStateChange() == ItemEvent.SELECTED) {
 				Collection<AttributedVertex> selectedVertices = getVertices(e.getItem());
-				notifySelectionChanged(new HashSet<AttributedVertex>(selectedVertices));
+				notifySelectionChanged(new HashSet<>(selectedVertices));
 
 				if (selectedVertices.size() == 1) {
 					// if only one vertex was selected, make it the focused vertex