diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/FcgVertex.java b/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/FcgVertex.java
index fca956b637..0a19e65b75 100644
--- a/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/FcgVertex.java
+++ b/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/FcgVertex.java
@@ -319,6 +319,12 @@ public class FcgVertex extends AbstractVisualVertex implements VertexShapeProvid
 		toggleInsButton.setBackground(Palette.NO_COLOR);
 		toggleOutsButton.setBackground(Palette.NO_COLOR);
 
+		// This is needed for Flat Dark theme to work correctly, due to the fact that it wants to
+		// paint its parent background when the button is opaque.  The parent background will get
+		// painted over any items that lie between the button and the parent.
+		toggleInsButton.setOpaque(false);
+		toggleOutsButton.setOpaque(false);
+
 		Rectangle parentBounds = vertexImageLabel.getBounds();
 		Dimension size = toggleInsButton.getPreferredSize();
 
diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/view/FcgComponent.java b/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/view/FcgComponent.java
index aabcc6167b..c2cd471364 100644
--- a/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/view/FcgComponent.java
+++ b/Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/graph/view/FcgComponent.java
@@ -53,6 +53,12 @@ public class FcgComponent extends GraphComponent<FcgVertex, FcgEdge, FunctionCal
 		build();
 	}
 
+	@Override
+	protected void setGraph(FunctionCallGraph g) {
+		this.fcGraph = g;
+		super.setGraph(g);
+	}
+
 	@Override
 	protected FcgVertex getInitialVertex() {
 		return fcGraph.getSource();