diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tab/GTabPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tab/GTabPanel.java
index db07bb7f6a..aca4e560d9 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tab/GTabPanel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tab/GTabPanel.java
@@ -74,7 +74,6 @@ public class GTabPanel<T> extends JPanel {
 		this.tabTypeName = tabTypeName;
 		setLayout(new HorizontalLayout(0));
 		setFocusable(true);
-		setBorder(new GTabPanelBorder());
 		getAccessibleContext().setAccessibleDescription(
 			"Use left and right arrows to highlight other tabs and press enter to select " +
 				"the highlighted tab");
@@ -491,11 +490,13 @@ public class GTabPanel<T> extends JPanel {
 		allTabs.clear();
 		removeAll();
 		closeTabList();
+		setBorder(null);
 		if (!shouldShowTabs()) {
 			revalidate();
 			repaint();
 			return;
 		}
+		setBorder(new GTabPanelBorder());
 
 		GTab<T> selectedTab = null;
 		int availableWidth = getPanelWidth();