3 files changed, 14 insertions, 0 deletions
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp
index d07bc11e..502977c5 100644
--- a/src/ExpandVolume/WinMain.cpp
+++ b/src/ExpandVolume/WinMain.cpp
@@ -612,6 +612,8 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			ShowWindow (GetDlgItem( hwndDlg, IDT_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), SW_SHOW);
+
+			SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
 			return 1;
 		}
 
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index 54196dee..141900b0 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -5481,6 +5481,10 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				ShowWindow (GetDlgItem( hwndDlg, IDT_PIM), PimEnable? SW_SHOW : SW_HIDE);
 				ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), PimEnable? SW_SHOW : SW_HIDE);
 				ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), PimEnable? SW_SHOW : SW_HIDE);
+				if (PimEnable)
+				{
+					SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
+				}
 			}
 			return 1;
 		}
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 310217a2..0895915a 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -2264,6 +2264,8 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), SW_SHOW);
 			}
 
+			SetFocus (GetDlgItem (hwndDlg, IDC_OLD_PIM));
+
 			return 1;
 		}
 
@@ -2274,6 +2276,8 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), SW_SHOW);
 
+			SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
+
 			return 1;
 		}
 
@@ -2816,6 +2820,8 @@ BOOL CALLBACK PasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			ShowWindow (GetDlgItem( hwndDlg, IDT_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), SW_SHOW);
+
+			SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
 			return 1;
 		}
 
@@ -3359,6 +3365,8 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			ShowWindow (GetDlgItem( hwndDlg, IDT_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM), SW_SHOW);
 			ShowWindow (GetDlgItem( hwndDlg, IDC_PIM_HELP), SW_SHOW);
+
+			SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
 			return 1;
 		}