diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java
index 52f5f852a0..d26b4d7110 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java
@@ -139,18 +139,16 @@ public class DataTypeListingHover extends AbstractConfigurableHover implements L
 			}
 			StringBuilder sb = new StringBuilder(HTMLUtilities.HTML);
 			sb.append("<TABLE>");
-			if (parent != null) {
-				DataType parentType = parent.getDataType();
-				sb.append(row("Parent: ", parentType.getDataTypePath()));
-				int offset = (int) data.getAddress().subtract(parent.getAddress());
-				sb.append(row("Offset: ", NumericUtilities.toHexString(offset)));
-				sb.append(row("Field Name: ", nameLoc.getFieldName()));
-				if (parentType instanceof Structure pst) {
-					DataTypeComponent dtc = pst.getComponentAt(offset);
-					String comment = dtc == null ? null : dtc.getComment();
-					if (comment != null) {
-						sb.append(row("Comment: ", comment));
-					}
+			DataType parentType = parent.getDataType();
+			sb.append(row("Parent: ", parentType.getDataTypePath()));
+			int offset = (int) data.getAddress().subtract(parent.getAddress());
+			sb.append(row("Offset: ", NumericUtilities.toHexString(offset)));
+			sb.append(row("Field Name: ", nameLoc.getFieldName()));
+			if (parentType instanceof Structure pst) {
+				DataTypeComponent dtc = pst.getComponentAt(offset);
+				String comment = dtc == null ? null : dtc.getComment();
+				if (comment != null) {
+					sb.append(row("Comment: ", comment));
 				}
 			}
 			sb.append("</TABLE>");
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/PopupWindow.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/PopupWindow.java
index b23ae5b4e4..6b7943160c 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/PopupWindow.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/PopupWindow.java
@@ -38,8 +38,8 @@ import util.CollectionUtils;
  * the window will be closed. 
  */
 public class PopupWindow {
-	private static final int X_PADDING = 25;
-	private static final int Y_PADDING = 25;
+	private static final int X_PADDING = 15;
+	private static final int Y_PADDING = 15;
 	private static final List<WeakReference<PopupWindow>> VISIBLE_POPUPS = new ArrayList<>();
 
 	public static void hideAllWindows() {
@@ -370,9 +370,7 @@ public class PopupWindow {
 			if (CollectionUtils.isAllNull(location, keepVisibleArea)) {
 				throw new NullPointerException("Both location and keepVisibleArea cannot be null");
 			}
-			if (keepVisibleArea == null) {
-				keepVisibleArea = new Rectangle(location, new Dimension(0, 0));
-			}
+
 			this.location = location;
 			this.source = source;
 			this.screenKeepVisibleArea = createScreenKeepVisibleArea(location, keepVisibleArea);