diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index e45b7d06..9ee58151 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -4600,7 +4600,7 @@ void __cdecl mountThreadFunction (void *hwndDlgArg)
 	HWND hwndDlg =(HWND) hwndDlgArg;
 	// Disable parent dialog during processing to avoid user interaction
 	EnableWindow(hwndDlg, FALSE);
-	finally_do_arg (HWND, hwndDlg, { EnableWindow(finally_arg, TRUE); });
+	finally_do_arg (HWND, hwndDlg, { EnableWindow(finally_arg, TRUE); bPrebootPasswordDlgMode = FALSE;});
 
 	Mount (hwndDlg, 0, 0, -1);	
 }
@@ -7243,9 +7243,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				bPrebootPasswordDlgMode = TRUE;
 
 				if (CheckMountList (hwndDlg, FALSE))
-					_beginthread(mountThreadFunction, 0, hwndDlg);
-
-				bPrebootPasswordDlgMode = FALSE;
+					_beginthread(mountThreadFunction, 0, hwndDlg);				
 			}
 			break;
 		}