diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
index 6aa83b4138..1b09e11030 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/crypto/PasswordDialog.java
@@ -111,6 +111,13 @@ class PasswordDialog extends DialogComponentProvider {
 		}
 	}
 
+	@Override
+	public void close() {
+		// override default close behavior to prevent dispose() from being called before
+		// the password value is retrieved
+		closeDialog();
+	}
+
 	@Override
 	protected void okCallback() {
 		resultState = RESULT_STATE.OK;