diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index be521fd6..824e3b6d 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -1290,6 +1290,9 @@ namespace VeraCrypt
 		if (Randinit() != ERR_SUCCESS)
 			throw ParameterIncorrect (SRC_POS);
 
+		/* force the display of the random enriching dialog */
+		SetRandomPoolEnrichedByUserStatus (FALSE);
+
 		UserEnrichRandomPool (ParentWindow);
 
 		if (!RandgetBytes (request.WipeKey, sizeof (request.WipeKey), TRUE))
@@ -2175,6 +2178,9 @@ namespace VeraCrypt
 		throw_sys_if (Randinit () != 0);
 		finally_do ({ RandStop (FALSE); });
 
+		/* force the display of the random enriching dialog */
+		SetRandomPoolEnrichedByUserStatus (FALSE);
+
 		NormalCursor();
 		UserEnrichRandomPool (ParentWindow);
 		WaitCursor();
diff --git a/src/Common/Password.c b/src/Common/Password.c
index b1fa83ef..2c065b68 100644
--- a/src/Common/Password.c
+++ b/src/Common/Password.c
@@ -232,6 +232,8 @@ int ChangePwd (const char *lpszVolume, Password *oldPassword, Password *newPassw
 	if (Randinit ())
 		goto error;
 
+	SetRandomPoolEnrichedByUserStatus (FALSE); /* force the display of the random enriching dialog */
+
 	if (!bDevice && bPreserveTimestamp)
 	{
 		if (GetFileTime ((HANDLE) dev, &ftCreationTime, &ftLastAccessTime, &ftLastWriteTime) == 0)
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index d1576608..0f58c66e 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -7652,6 +7652,9 @@ noHidden:
 		goto error;
 	}
 
+	/* force the display of the random enriching dialog */
+	SetRandomPoolEnrichedByUserStatus (FALSE);
+
 	NormalCursor();
 	UserEnrichRandomPool (hwndDlg);
 	WaitCursor();
@@ -7807,6 +7810,9 @@ int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume)
 	OpenVolumeContext volume;
 	volume.VolumeIsOpen = FALSE;
 
+	/* force the display of the random enriching dialog */
+	SetRandomPoolEnrichedByUserStatus (FALSE);
+
 	WaitCursor();
 
 	if (restoreInternalBackup)