diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs index 789191055..08c6e1c84 100644 --- a/mRemoteNG/UI/Forms/frmMain.cs +++ b/mRemoteNG/UI/Forms/frmMain.cs @@ -216,6 +216,14 @@ namespace mRemoteNG.UI.Forms Runtime.ConnectionsService.ConnectionsLoaded += ConnectionsServiceOnConnectionsLoaded; Runtime.ConnectionsService.ConnectionsSaved += ConnectionsServiceOnConnectionsSaved; + + // Close splash screen before loading connections to ensure password dialog appears on top + FrmSplashScreenNew splash = FrmSplashScreenNew.GetInstance(); + if (splash.Dispatcher.CheckAccess()) + splash.Close(); + else + splash.Dispatcher.Invoke(() => splash.Close()); + CredsAndConsSetup credsAndConsSetup = new(); credsAndConsSetup.LoadCredsAndCons(); @@ -234,12 +242,6 @@ namespace mRemoteNG.UI.Forms pnlDock.ShowDocumentIcon = true; - FrmSplashScreenNew splash = FrmSplashScreenNew.GetInstance(); - if (splash.Dispatcher.CheckAccess()) - splash.Close(); - else - splash.Dispatcher.Invoke(() => splash.Close()); - if (Properties.OptionsStartupExitPage.Default.StartMinimized) { WindowState = FormWindowState.Minimized;