diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/AbstractIntegerTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/AbstractIntegerTextField.java
index d6e9a7dbd2..e3ab39fe7f 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/AbstractIntegerTextField.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/AbstractIntegerTextField.java
@@ -388,6 +388,9 @@ public class AbstractIntegerTextField {
 	}
 
 	private BigInteger parse(String text, IntegerFormat format) {
+		if (text.equals("0") || text.equals("-0")) {
+			return BigInteger.ZERO;
+		}
 		String prefix = format.getPrefix();
 		if (usePrefix && !prefix.isBlank()) {
 			if (text.startsWith(prefix)) {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/MultiFormatTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/MultiFormatTextField.java
index 1dd7a03560..fbd6a27083 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/MultiFormatTextField.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/integer/MultiFormatTextField.java
@@ -30,7 +30,6 @@ import docking.DockingUtils;
 import docking.util.GraphicsUtils;
 import generic.theme.GThemeDefaults.Colors.Messages;
 import generic.theme.Gui;
-import ghidra.util.Swing;
 import utility.function.Callback;
 
 /**
@@ -82,17 +81,17 @@ public class MultiFormatTextField extends JTextField {
 
 			@Override
 			public void removeUpdate(DocumentEvent e) {
-				Swing.runLater(() -> c.call());
+				c.call();
 			}
 
 			@Override
 			public void insertUpdate(DocumentEvent e) {
-				Swing.runLater(() -> c.call());
+				c.call();
 			}
 
 			@Override
 			public void changedUpdate(DocumentEvent e) {
-				Swing.runLater(() -> c.call());
+				c.call();
 			}
 		});
 	}
diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/textfield/AbstractIntegerTextFieldTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/textfield/AbstractIntegerTextFieldTest.java
index b35557ff07..e839732bd7 100644
--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/textfield/AbstractIntegerTextFieldTest.java
+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/textfield/AbstractIntegerTextFieldTest.java
@@ -51,7 +51,7 @@ public abstract class AbstractIntegerTextFieldTest<T extends AbstractIntegerText
 
 	@After
 	public void tearDown() throws Exception {
-		frame.setVisible(false);
+		runSwing(() -> frame.dispose());
 	}
 
 	protected void setFormat(IntegerFormat format) {