diff --git a/FluentPassFinder/App.xaml b/FluentPassFinder/App.xaml
index 2c172d0..045cee1 100644
--- a/FluentPassFinder/App.xaml
+++ b/FluentPassFinder/App.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" 
+    xmlns:s="clr-namespace:System;assembly=mscorlib"
     ShutdownMode="OnExplicitShutdown" >
     <Application.Resources>
         <ResourceDictionary>
@@ -10,6 +11,8 @@
                 <ui:ThemesDictionary Theme="Dark" />
                 <ui:ControlsDictionary />
             </ResourceDictionary.MergedDictionaries>
+            <s:Boolean x:Key="True">True</s:Boolean>
+            <s:Boolean x:Key="False">False</s:Boolean>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/FluentPassFinder/FluentPassFinder.csproj b/FluentPassFinder/FluentPassFinder.csproj
index 8ff1dff..12e2021 100644
--- a/FluentPassFinder/FluentPassFinder.csproj
+++ b/FluentPassFinder/FluentPassFinder.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
 	<OutDir>$(SolutionDir)Build/$(Configuration)/$(TargetFramework)/bin</OutDir>
+	<TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/FluentPassFinder/Views/SearchWindow.xaml b/FluentPassFinder/Views/SearchWindow.xaml
index be2ae87..8c7edee 100644
--- a/FluentPassFinder/Views/SearchWindow.xaml
+++ b/FluentPassFinder/Views/SearchWindow.xaml
@@ -34,7 +34,7 @@
     </ui:FluentWindow.Resources>
     <ui:FluentWindow.InputBindings>
         <KeyBinding Gesture="Escape"
-                    Command="{Binding HideSearchWindowCommand}" />
+                    Command="{Binding HideSearchWindowCommand}" CommandParameter="{StaticResource True}" />
         <KeyBinding Gesture="Enter"
                     Command="{Binding ViewModel.EnterActionCommand}"  />
         <KeyBinding Gesture="Shift+Enter"
diff --git a/FluentPassFinder/Views/SearchWindow.xaml.cs b/FluentPassFinder/Views/SearchWindow.xaml.cs
index 7547217..e1a5dcb 100644
--- a/FluentPassFinder/Views/SearchWindow.xaml.cs
+++ b/FluentPassFinder/Views/SearchWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using WpfScreenHelper;
+using System.Timers;
 
 namespace FluentPassFinder.Views
 {
@@ -28,22 +29,42 @@ protected override void OnDeactivated(EventArgs e)
         }
 
         [RelayCommand]
-        public void HideSearchWindow()
+        public void HideSearchWindow(bool clearInputDirectly=false)
         {
             if (!isClosing && !isOpening)
             {
                 isClosing = true;
                 Hide();
-
-                ViewModel.SearchText = string.Empty;
-                ViewModel.Entries.Clear();
-
-                ViewModel.IsContextMenuOpen = false;
-                ViewModel.SelectedEntry = null;
+                if(clearInputDirectly){
+                    ClearInputs();
+                }else{
+                    ClearInputsAfterDelay(TimeSpan.FromSeconds(30));
+                }
 
                 isClosing = false;
             }
         }
+        private void ClearInputsAfterDelay(TimeSpan delay)
+        {
+            var timer = new System.Threading.Timer(_ =>
+            {
+                Dispatcher.Invoke(() =>
+                {
+                    ClearInputs();
+                });
+            }, null, delay, Timeout.InfiniteTimeSpan);
+        }
+
+        private void ClearInputs()
+        {
+            ViewModel.SearchText = string.Empty;
+            ViewModel.Entries.Clear();
+
+            ViewModel.IsContextMenuOpen = false;
+            ViewModel.SelectedEntry = null;
+        }
+
+        
 
         public void ShowSearchWindow(bool showOnPrimaryScreen)
         {