diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index 0f995a8ebc..783c4482cd 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -6876,6 +6876,15 @@ public static string ProfileEncryptionDisclaimer {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Profile file ähnelt.
+        /// </summary>
+        public static string ProfileFile {
+            get {
+                return ResourceManager.GetString("ProfileFile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Profile file could not be loaded! ähnelt.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index a27f42d61b..b568f36d54 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3876,4 +3876,7 @@ Right-click for more options.</value>
   <data name="Donate" xml:space="preserve">
     <value>Donate</value>
   </data>
+  <data name="ProfileFile" xml:space="preserve">
+    <value>Profile file</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager.Settings/ConfigurationInfo.cs b/Source/NETworkManager.Settings/ConfigurationInfo.cs
index e93b1a4b69..491f23227f 100644
--- a/Source/NETworkManager.Settings/ConfigurationInfo.cs
+++ b/Source/NETworkManager.Settings/ConfigurationInfo.cs
@@ -430,6 +430,27 @@ public string ProfileManagerErrorMessage
         }
     }
 
+    /// <summary>
+    /// Private variable for <see cref="IsChildWindowOpen" />.
+    /// </summary>
+    private bool _isChildWindowOpen;
+
+    /// <summary>
+    /// Indicates if a child window is open.
+    /// </summary>
+    public bool IsChildWindowOpen
+    {
+        get => _isChildWindowOpen;
+        set
+        {
+            if (value == _isChildWindowOpen)
+                return;
+
+            _isChildWindowOpen = value;
+            OnPropertyChanged();
+        }
+    }
+
     /// <summary>
     ///     Private variable for <see cref="FixAirspace" />.
     /// </summary>
diff --git a/Source/NETworkManager/MainWindow.xaml b/Source/NETworkManager/MainWindow.xaml
index 304799a908..8a67897a53 100644
--- a/Source/NETworkManager/MainWindow.xaml
+++ b/Source/NETworkManager/MainWindow.xaml
@@ -88,7 +88,7 @@
         </mah:WindowCommands>
     </mah:MetroWindow.LeftWindowCommands>
     <mah:MetroWindow.RightWindowCommands>
-        <mah:WindowCommands ShowSeparators="False" Visibility="{Binding IsWelcomeWindowOpen, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
+        <mah:WindowCommands ShowSeparators="False" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsChildWindowOpen, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
             <Button Command="{Binding OpenRunCommand}"
                     Visibility="{Binding Path=FlyoutRunCommandIsOpen, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
                     ToolTip="{x:Static localization:Strings.ToolTip_RunCommandWithHotKey}"
diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
index 26a318e624..bb012051d6 100644
--- a/Source/NETworkManager/MainWindow.xaml.cs
+++ b/Source/NETworkManager/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using log4net;
+using Dragablz;
+using log4net;
 using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
@@ -9,8 +10,6 @@
 using NETworkManager.Models.AWS;
 using NETworkManager.Models.EventSystem;
 using NETworkManager.Models.Network;
-using NETworkManager.Models.PowerShell;
-using NETworkManager.Models.PuTTY;
 using NETworkManager.Profiles;
 using NETworkManager.Settings;
 using NETworkManager.Update;
@@ -19,11 +18,9 @@
 using NETworkManager.Views;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
@@ -38,7 +35,6 @@
 using System.Windows.Interop;
 using System.Windows.Markup;
 using System.Windows.Threading;
-using Dragablz;
 using Application = System.Windows.Application;
 using ContextMenu = System.Windows.Controls.ContextMenu;
 using MouseEventArgs = System.Windows.Forms.MouseEventArgs;
@@ -116,21 +112,6 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
     private bool _isInTray;
     private bool _isClosing;
 
-    private bool _isWelcomeWindowOpen;
-
-    public bool IsWelcomeWindowOpen
-    {
-        get => _isWelcomeWindowOpen;
-        set
-        {
-            if (value == _isWelcomeWindowOpen)
-                return;
-
-            _isWelcomeWindowOpen = value;
-            OnPropertyChanged();
-        }
-    }
-
     private bool _applicationViewIsExpanded;
 
     public bool ApplicationViewIsExpanded
@@ -412,7 +393,7 @@ public ProfileFileInfo SelectedProfileFile
             {
                 if (!_isProfileFileUpdating)
                     LoadProfile(value);
-
+                
                 ConfigurationManager.Current.ProfileManagerShowUnlock = value.IsEncrypted && !value.IsPasswordValid;
                 SettingsManager.Current.Profiles_LastSelected = value.Name;
             }
@@ -492,13 +473,13 @@ await this.ShowMessageAsync(Strings.SettingsHaveBeenReset,
         if (SettingsManager.Current.WelcomeDialog_Show)
         {
 
-            var welcomeChildWindow = new WelcomeChildWindow();
+            var childWindow = new WelcomeChildWindow();
 
-            var welcomeViewModel = new WelcomeViewModel(async instance =>
+            var viewModel = new WelcomeViewModel(instance =>
             {
-                IsWelcomeWindowOpen = false;
+                childWindow.IsOpen = false;
 
-                welcomeChildWindow.IsOpen = false;
+                ConfigurationManager.Current.IsChildWindowOpen = false;
 
                 // Set settings based on user choice
                 SettingsManager.Current.Update_CheckForUpdatesAtStartup = instance.CheckForUpdatesAtStartup;
@@ -511,21 +492,13 @@ await this.ShowMessageAsync(Strings.SettingsHaveBeenReset,
                     instance.PowerShellModifyGlobalProfile;
 
                 // Generate lists at runtime
-                SettingsManager.Current.General_ApplicationList =
-                    new ObservableSetCollection<ApplicationInfo>(ApplicationManager.GetDefaultList());
-                SettingsManager.Current.IPScanner_CustomCommands =
-                    new ObservableCollection<CustomCommandInfo>(IPScannerCustomCommand.GetDefaultList());
-                SettingsManager.Current.PortScanner_PortProfiles =
-                    new ObservableCollection<PortProfileInfo>(PortProfile.GetDefaultList());
-                SettingsManager.Current.DNSLookup_DNSServers =
-                    new ObservableCollection<DNSServerConnectionInfoProfile>(DNSServer.GetDefaultList());
-                SettingsManager.Current.AWSSessionManager_AWSProfiles =
-                    new ObservableCollection<AWSProfileInfo>(AWSProfile.GetDefaultList());
-                SettingsManager.Current.SNMP_OidProfiles =
-                    new ObservableCollection<SNMPOIDProfileInfo>(SNMPOIDProfile.GetDefaultList());
-                SettingsManager.Current.SNTPLookup_SNTPServers =
-                    new ObservableCollection<ServerConnectionInfoProfile>(SNTPServer.GetDefaultList());
-
+                SettingsManager.Current.General_ApplicationList = [.. ApplicationManager.GetDefaultList()];
+                SettingsManager.Current.IPScanner_CustomCommands = [.. IPScannerCustomCommand.GetDefaultList()];
+                SettingsManager.Current.PortScanner_PortProfiles = [.. PortProfile.GetDefaultList()];
+                SettingsManager.Current.DNSLookup_DNSServers = [.. DNSServer.GetDefaultList()];
+                SettingsManager.Current.AWSSessionManager_AWSProfiles = [.. AWSProfile.GetDefaultList()];
+                SettingsManager.Current.SNMP_OidProfiles = [.. SNMPOIDProfile.GetDefaultList()];
+                SettingsManager.Current.SNTPLookup_SNTPServers = [.. SNTPServer.GetDefaultList()];
                 SettingsManager.Current.WelcomeDialog_Show = false;
 
                 // Save it to create a settings file
@@ -534,11 +507,11 @@ await this.ShowMessageAsync(Strings.SettingsHaveBeenReset,
                 Load();
             });
 
-            welcomeChildWindow.DataContext = welcomeViewModel;
+            childWindow.DataContext = viewModel;
 
-            IsWelcomeWindowOpen = true;
+            ConfigurationManager.Current.IsChildWindowOpen = true;
 
-            await this.ShowChildWindowAsync(welcomeChildWindow);
+            await this.ShowChildWindowAsync(childWindow);
         }
         else
         {
@@ -1395,7 +1368,7 @@ private void LoadProfiles()
             .FirstOrDefault(x => x.Name == SettingsManager.Current.Profiles_LastSelected);
         SelectedProfileFile ??= ProfileFiles.SourceCollection.Cast<ProfileFileInfo>().FirstOrDefault();
     }
-
+    
     private async void LoadProfile(ProfileFileInfo info, bool showWrongPassword = false)
     {
         // Disable profile management while switching profiles
@@ -1404,34 +1377,37 @@ private async void LoadProfile(ProfileFileInfo info, bool showWrongPassword = fa
 
         if (info.IsEncrypted && !info.IsPasswordValid)
         {
-            var customDialog = new CustomDialog
-            {
-                Title = Strings.UnlockProfileFile
-            };
+            var childWindow = new CredentialsPasswordProfileFileChildWindow();
 
-            var viewModel = new CredentialsPasswordProfileFileViewModel(async instance =>
+            var viewModel = new CredentialsPasswordProfileFileViewModel(instance =>
             {
-                await this.HideMetroDialogAsync(customDialog);
+                childWindow.IsOpen = false;
+
+                ConfigurationManager.Current.IsChildWindowOpen = false;
+
                 ConfigurationManager.OnDialogClose();
 
                 info.Password = instance.Password;
 
                 SwitchProfile(info);
-            }, async _ =>
+            }, _ =>
             {
-                await this.HideMetroDialogAsync(customDialog);
+                childWindow.IsOpen = false;
+
+                ConfigurationManager.Current.IsChildWindowOpen = false;
+
                 ConfigurationManager.OnDialogClose();
 
                 ProfileManager.Unload();
             }, info.Name, showWrongPassword);
 
-            customDialog.Content = new CredentialsPasswordProfileFileDialog
-            {
-                DataContext = viewModel
-            };
+            childWindow.DataContext = viewModel;
 
             ConfigurationManager.OnDialogOpen();
-            await this.ShowMetroDialogAsync(customDialog);
+
+            ConfigurationManager.Current.IsChildWindowOpen = true;
+
+            await this.ShowChildWindowAsync(childWindow);
         }
         else
         {
@@ -1566,7 +1542,7 @@ private IntPtr HwndHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref
 
             // Handle system commands (like maximize and restore)
             case WmSysCommand:
-                
+
                 switch (wParam.ToInt32())
                 {
                     // Window is maximized
@@ -1584,7 +1560,7 @@ private IntPtr HwndHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref
 
         return IntPtr.Zero;
     }
-    
+
     private void UpdateOnWindowResize()
     {
         foreach (var tabablzControl in VisualTreeHelper.FindVisualChildren<TabablzControl>(this))
@@ -1609,6 +1585,7 @@ private void UpdateOnWindowResize()
     private static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vk);
 
     [DllImport("user32.dll")]
+
     private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
 
     // WM_HOTKEY
@@ -1920,7 +1897,7 @@ private void ConfigureDNSServer()
 
         DNSClient.GetInstance().Configure(dnsSettings);
     }
-    
+
     #endregion
 
     #region Status window
diff --git a/Source/NETworkManager/Resources/Styles/PasswordBoxStyles.xaml b/Source/NETworkManager/Resources/Styles/PasswordBoxStyles.xaml
index 6c5cd00709..c9f11f6b2f 100644
--- a/Source/NETworkManager/Resources/Styles/PasswordBoxStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/PasswordBoxStyles.xaml
@@ -11,6 +11,7 @@
         <Setter Property="FontSize" Value="14" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray8}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Gray8}" />
         <Setter Property="mah:PasswordBoxHelper.CapsLockWarningToolTip"
                 Value="{x:Static localization:Strings.CapsLockIsEnabled}" />
         <Setter Property="mah:PasswordBoxHelper.CapsLockIcon">
diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
index 2d1d5f103d..f2944390c2 100644
--- a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -252,7 +252,9 @@ private set
 
     private bool Refresh_CanExecute(object parameter)
     {
-        return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+        return Application.Current.MainWindow != null && 
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;        
     }
 
     private async Task RefreshAction()
@@ -267,7 +269,9 @@ private async Task RefreshAction()
 
     private bool DeleteTable_CanExecute(object parameter)
     {
-        return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+        return Application.Current.MainWindow != null &&
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private async Task DeleteTableAction()
@@ -297,8 +301,8 @@ private async Task DeleteTableAction()
     private bool DeleteEntry_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen  &&
+               !ConfigurationManager.Current.IsChildWindowOpen;;
     }
 
     private async Task DeleteEntryAction()
@@ -328,8 +332,8 @@ private async Task DeleteEntryAction()
     private bool AddEntry_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private async Task AddEntryAction()
diff --git a/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs b/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
index ce1c4a70be..a90288a3d6 100644
--- a/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/BitCalculatorViewModel.cs
@@ -155,8 +155,8 @@ private void LoadSettings()
     private bool Calculate_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void CalculateAction()
diff --git a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
index 0cf04f7284..420296ebb9 100644
--- a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
@@ -276,7 +276,9 @@ public string StatusMessage
 
     private bool Refresh_CanExecute(object parameter)
     {
-        return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+        return Application.Current.MainWindow != null && 
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private async Task RefreshAction()
diff --git a/Source/NETworkManager/ViewModels/CredentialsPasswordProfileFileViewModel.cs b/Source/NETworkManager/ViewModels/CredentialsPasswordProfileFileViewModel.cs
index e37f21922a..6ad8a41c67 100644
--- a/Source/NETworkManager/ViewModels/CredentialsPasswordProfileFileViewModel.cs
+++ b/Source/NETworkManager/ViewModels/CredentialsPasswordProfileFileViewModel.cs
@@ -1,7 +1,7 @@
-using System;
+using NETworkManager.Utilities;
+using System;
 using System.Security;
 using System.Windows.Input;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.ViewModels;
 
@@ -27,7 +27,6 @@ public class CredentialsPasswordProfileFileViewModel : ViewModelBase
     /// </summary>
     private bool _showWrongPassword;
 
-
     /// <summary>
     ///     Initialize a new class <see cref="CredentialsPasswordProfileFileViewModel" /> with <see cref="OKCommand" /> and
     ///     <see cref="CancelCommand" />.
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
index eb50d42ee1..51f0f47f3e 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -276,7 +276,8 @@ x is QueryType.A or QueryType.AAAA or QueryType.ANY or QueryType.CNAME or QueryT
     private bool Query_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void QueryAction()
diff --git a/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs b/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
index 98e64c12a4..61ae4c3fff 100644
--- a/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPGeolocationViewModel.cs
@@ -165,7 +165,8 @@ private void LoadSettings()
     private bool Query_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void QueryAction()
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index aad0130127..a95b877b2e 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -272,7 +272,9 @@ public void OnLoaded()
 
     private bool Scan_CanExecute(object parameter)
     {
-        return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+        return Application.Current.MainWindow != null && 
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void ScanAction()
diff --git a/Source/NETworkManager/ViewModels/ListenersViewModel.cs b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
index bddde6c2b3..2fbb0c11e4 100644
--- a/Source/NETworkManager/ViewModels/ListenersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
@@ -268,7 +268,8 @@ public string StatusMessage
     private bool Refresh_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private async Task RefreshAction()
diff --git a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
index 23989159fb..864469f525 100644
--- a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
@@ -180,8 +180,9 @@ public bool NothingFound
     private bool OUILookup_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen && !HasError;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&            
+               !ConfigurationManager.Current.IsChildWindowOpen && 
+               !HasError;
     }
 
     private async void OUILookupAction()
diff --git a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
index cf23746d11..36f98e1f0f 100644
--- a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
@@ -178,8 +178,8 @@ public bool NothingFound
     private bool PortLookup_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen && !HasError;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen  &&
+               !ConfigurationManager.Current.IsChildWindowOpen && !HasError;
     }
 
     private async Task PortLookupAction()
diff --git a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
index 6501f6d01c..cbddcf2b1e 100644
--- a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
+++ b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
@@ -668,8 +668,8 @@ private bool ReloadNetworkInterfaces_CanExecute(object obj)
     {
         return !IsNetworkInterfaceLoading &&
                Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void ReloadNetworkInterfacesAction()
@@ -730,8 +730,8 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
     private bool ApplyConfiguration_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen  &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void ApplyConfigurationAction()
@@ -803,8 +803,8 @@ private void ClearSearchAction()
     private bool AdditionalCommands_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     public ICommand OpenNetworkConnectionsCommand =>
diff --git a/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs b/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
index aeace1b674..2cbb4a41ca 100644
--- a/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs
@@ -312,7 +312,9 @@ private void LoadSettings()
 
     private bool Ping_CanExecute(object parameter)
     {
-        return Application.Current.MainWindow != null && !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+        return Application.Current.MainWindow != null && 
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen && 
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void PingAction()
diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
index b845b595ed..041272ac6b 100644
--- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
@@ -288,8 +288,8 @@ public void OnClose()
     private bool OpenPortProfileSelection_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void OpenPortProfileSelectionAction()
@@ -302,7 +302,8 @@ private void OpenPortProfileSelectionAction()
     private bool Scan_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void ScanAction()
diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
index 017e3e8b7f..53123d87a4 100644
--- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -489,7 +489,8 @@ private set
     private bool Work_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void WorkAction()
diff --git a/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs b/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
index ae344e243a..685807f80e 100644
--- a/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNTPLookupViewModel.cs
@@ -186,7 +186,8 @@ private void LoadSettings()
     private bool Query_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void QueryAction()
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorCalculatorViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorCalculatorViewModel.cs
index d55bdd6b8b..59b51ebcbc 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorCalculatorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorCalculatorViewModel.cs
@@ -97,8 +97,8 @@ private set
     private bool Calculate_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void CalculateAction()
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
index 96f7518b5f..6656589c8c 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
@@ -172,8 +172,8 @@ public IList SelectedResults
     private bool Calculate_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void CalculateAction()
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
index 8932b3e8c3..59b1ab7d1c 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
@@ -117,8 +117,8 @@ private set
     private bool Calculate_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void CalculateAction()
diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
index 267ea61bff..2c5d5c7126 100644
--- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
@@ -210,7 +210,8 @@ private void LoadSettings()
     private bool Trace_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)!.IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow)!.IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void TraceAction()
diff --git a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
index 2baa63906e..6ff7c1e246 100644
--- a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
@@ -278,8 +278,8 @@ private void LoadSettings()
     private bool WakeUpAction_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow)
-                   .IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void WakeUpAction()
diff --git a/Source/NETworkManager/ViewModels/WhoisViewModel.cs b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
index 9e27233a5d..36c26a5533 100644
--- a/Source/NETworkManager/ViewModels/WhoisViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
@@ -164,7 +164,8 @@ private void LoadSettings()
     private bool Query_CanExecute(object parameter)
     {
         return Application.Current.MainWindow != null &&
-               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen;
+               !((MetroWindow)Application.Current.MainWindow).IsAnyDialogOpen &&
+               !ConfigurationManager.Current.IsChildWindowOpen;
     }
 
     private void QueryAction()
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
similarity index 53%
rename from Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml
rename to Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
index e30bffac3b..e6767b095f 100644
--- a/Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml
+++ b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.CredentialsPasswordProfileFileDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.CredentialsPasswordProfileFileChildWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -8,23 +8,49 @@
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:CredentialsPasswordProfileFileViewModel}">
-    <UserControl.Resources>
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             ShowTitleBar="False" 
+             ChildWindowMaxWidth="650"
+             ChildWindowMaxHeight="800"                
+             Padding="20"
+             CloseByEscape="False"                               
+             OverlayBrush="{DynamicResource MahApps.Brushes.Gray.SemiTransparent}"
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:CredentialsPasswordProfileFileViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="10" />
-            <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="10" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="20" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Text="{x:Static localization:Strings.EnterMasterPasswordToUnlockProfile}"
-                   Style="{StaticResource DefaultTextBlock}" />
-        <Grid Grid.Row="2">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Rectangle Width="24" Height="24"
+                       Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                <Rectangle.OpacityMask>
+                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:FontAwesome Kind=UserLockSolid}" />
+                </Rectangle.OpacityMask>
+            </Rectangle>
+            <TextBlock Grid.Column="2" Grid.Row="0" 
+                       Text="{x:Static localization:Strings.UnlockProfileFile}"
+                       Style="{DynamicResource HeaderTextBlock}"
+                       Margin="0" />
+        </Grid>
+        <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.EnterMasterPasswordToUnlockProfile}"
+                Style="{StaticResource DefaultTextBlock}" />
+        <Grid Grid.Column="0" Grid.Row="4">
             <Grid.Resources>
                 <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}" />
@@ -39,26 +65,25 @@
                 <ColumnDefinition Width="10" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Profile}" />
-            <TextBox Grid.Column="2" Grid.Row="0" Text="{Binding ProfileName}" Style="{StaticResource ReadOnlyTextBox}"
-                     IsEnabled="False" />
-            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Password}" />
-            <PasswordBox x:Name="PasswordBoxPassword" Grid.Column="2" Grid.Row="2"
-                         Style="{StaticResource DefaultPasswordBox}">
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.ProfileFile}" />
+            <TextBlock Grid.Column="2" Grid.Row="0" Text="{Binding ProfileName}" Style="{StaticResource InfoTextBlock}" />
+            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Password}" />            
+            <PasswordBox x:Name="PasswordBoxPassword" Grid.Column="2" Grid.Row="2"                    
+                      Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                     Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
         </Grid>
-        <Grid Grid.Row="3" Margin="0,10,0,0"
-              Visibility="{Binding ShowWrongPassword, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+        <Grid Grid.Column="0" Grid.Row="5" Margin="0,10,0,0"
+           Visibility="{Binding ShowWrongPassword, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
             <TextBlock Text="{x:Static localization:Strings.WrongPasswordDecryptionFailedMessage}"
-                       Style="{StaticResource ErrorTextBlock}" />
+                    Style="{StaticResource ErrorTextBlock}" />
         </Grid>
-        <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Column="0" Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True"
-                    Margin="0,0,10,0">
+                 Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -71,7 +96,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+                 Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</simpleChildWindow:ChildWindow>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
new file mode 100644
index 0000000000..df9bd01fd9
--- /dev/null
+++ b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
@@ -0,0 +1,9 @@
+namespace NETworkManager.Views;
+
+public partial class CredentialsPasswordProfileFileChildWindow
+{
+    public CredentialsPasswordProfileFileChildWindow()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml.cs
deleted file mode 100644
index ae30d5d920..0000000000
--- a/Source/NETworkManager/Views/CredentialsPasswordProfileFileDialog.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows;
-
-namespace NETworkManager.Views;
-
-public partial class CredentialsPasswordProfileFileDialog
-{
-    public CredentialsPasswordProfileFileDialog()
-    {
-        InitializeComponent();
-    }
-
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
-    {
-        PasswordBoxPassword.Focus();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
index feb3992e38..eaa66dc3af 100644
--- a/Source/NETworkManager/Views/WelcomeChildWindow.xaml
+++ b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
@@ -17,7 +17,7 @@
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
-            <RowDefinition Height="10" />
+            <RowDefinition Height="20" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <ScrollViewer Grid.Row="0" HorizontalScrollBarVisibility="Disabled">
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 6c2385f741..cc1900a9b9 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -33,6 +33,10 @@ Release date: **xx.xx.2025**
 
 - Find `pwsh.exe` and `powershell.exe` executable by path, similar to `where.exe`. [#2962](https://github.com/BornToBeRoot/NETworkManager/pull/2962)
 
+**Profiles**
+
+- Changed the unlock dialog from `MahApps.Metro.Controls.Dialogs` to `MahApps.Metro.SimpleChildWindow`, so the main window can be dragged and resized [#3010](https://github.com/BornToBeRoot/NETworkManager/pull/3010)
+
 ## Bugfixes
 
 **Network Interface**