diff --git a/DS4Windows/DS4Forms/MainWindow.xaml b/DS4Windows/DS4Forms/MainWindow.xaml
index 0d1fca1..34c95d4 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml
+++ b/DS4Windows/DS4Forms/MainWindow.xaml
@@ -296,9 +296,9 @@
                         <local:LanguagePackControl Margin="{StaticResource spaceMargin}" />
                         <StackPanel Margin="{StaticResource spaceMargin}">
                             <CheckBox x:Name="customSteamCk" Content="Use custom Steam Folder" Margin="{StaticResource spaceMargin}"
-                                  IsChecked="{Binding UseCustomSteamFolder}" Click="CustomSteamCk_Click"  />
+                                  IsChecked="{Binding UseCustomSteamFolder}" />
                             <TextBox x:Name="customSteamTxt" Text="{Binding CustomSteamFolder, UpdateSourceTrigger=LostFocus}"
-                                 IsEnabled="False" />
+                                 IsEnabled="{Binding UseCustomSteamFolder}" />
                         </StackPanel>
 
                         <GroupBox Width="200" Header="Utils" BorderThickness="2" Margin="{StaticResource spaceMargin}"
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
index 74da89b..00d1098 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml.cs
+++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -1244,12 +1244,6 @@ Suspend support not enabled.", true);
             Close();
         }
 
-        private void CustomSteamCk_Click(object sender, RoutedEventArgs e)
-        {
-            bool state = customSteamCk.IsChecked == true;
-            customSteamTxt.IsEnabled = state;
-        }
-
         private void SwipeTouchCk_Click(object sender, RoutedEventArgs e)
         {
             bool status = swipeTouchCk.IsChecked == true;
diff --git a/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs b/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
index 7b35b60..0efd18d 100644
--- a/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
@@ -157,8 +157,17 @@ namespace DS4WinWPF.DS4Forms.ViewModels
         public string UdpIpAddress { get => DS4Windows.Global.getUDPServerListenAddress();
             set => DS4Windows.Global.setUDPServerListenAddress(value); }
         public int UdpPort { get => DS4Windows.Global.getUDPServerPortNum(); set => DS4Windows.Global.setUDPServerPort(value); }
-        public bool UseCustomSteamFolder { get => DS4Windows.Global.UseCustomSteamFolder;
-            set => DS4Windows.Global.UseCustomSteamFolder = value; }
+        public bool UseCustomSteamFolder
+        {
+            get => DS4Windows.Global.UseCustomSteamFolder;
+            set
+            {
+                DS4Windows.Global.UseCustomSteamFolder = value;
+                UseCustomSteamFolderChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+        public event EventHandler UseCustomSteamFolderChanged;
+
         public string CustomSteamFolder
         {
             get => DS4Windows.Global.CustomSteamFolder;
@@ -166,7 +175,7 @@ namespace DS4WinWPF.DS4Forms.ViewModels
             {
                 string temp = DS4Windows.Global.CustomSteamFolder;
                 if (temp == value) return;
-                if (Directory.Exists(temp))
+                if (Directory.Exists(value) || value == string.Empty)
                 {
                     DS4Windows.Global.CustomSteamFolder = value;
                 }