diff --git a/Seenginx/Components/FilesWithEditor.razor b/Seenginx/Components/FilesWithEditor.razor
index 2a26c00..052a937 100644
--- a/Seenginx/Components/FilesWithEditor.razor
+++ b/Seenginx/Components/FilesWithEditor.razor
@@ -4,7 +4,13 @@
 
 	<div class="files">
 
-		<div class="field is-horizontal sameMarginBottom">
+		<div class="field has-addons sameMarginBottom">
+			<div class="control has-icons-left is-expanded">
+				<input formnovalidate @oninput="e => SearchInputChanged(e.Value.ToString())" class="input is-rounded is-small" type="text" placeholder="Search...">
+				<span class="icon is-small is-left">
+					<i class="mdi mdi-search-web"></i>
+				</span>
+			</div>
 			<div class="control has-icons-left">
 				<div class="select is-small is-rounded">
 					<select @onchange="e => OnFilterClick(e.Value.ToString())">
@@ -18,12 +24,6 @@
 					<i class="mdi mdi-folder-cog-outline"></i>
 				</span>
 			</div>
-			<p class="control has-icons-left">
-				<input formnovalidate @oninput="e => SearchInputChanged(e.Value.ToString())" class="input is-rounded is-small" type="text" placeholder="Search...">
-				<span class="icon is-small is-left">
-					<i class="mdi mdi-search-web"></i>
-				</span>
-			</p>
 		</div>
 
 		<div class="filesList neomorphSmall borderRSmall sameMarginBottom">
diff --git a/Seenginx/Components/FilesWithEditor.razor.cs b/Seenginx/Components/FilesWithEditor.razor.cs
index 8046a36..201d5e9 100644
--- a/Seenginx/Components/FilesWithEditor.razor.cs
+++ b/Seenginx/Components/FilesWithEditor.razor.cs
@@ -18,9 +18,7 @@ namespace Seenginx.Components
 		[Parameter]
 		public List<string> Filters { get; set; } = new List<string>();
 		[Parameter]
-		public List<int> FilteredOutFiles { get; set; } = new List<int>();
-		[Parameter]
-		public EventCallback<string> ApplyFilter { get; set; }
+		public Dictionary<string, string> FilterFolder { get; set; } = new Dictionary<string, string>();
 
 		[Parameter]
 		public EventCallback AddFile { get; set; }
@@ -42,6 +40,7 @@ namespace Seenginx.Components
 		public RenderFragment<CFile> DeleteDialog { get; set; }
 
 		protected string SelectedFilter { get; set; }
+		protected string SearchInput { get; set; }
 
 		protected bool IsAnyFileSelected => SelectedFile != default;
 
@@ -58,26 +57,69 @@ namespace Seenginx.Components
 
 		protected async Task OnFilterClick(string filter)
 		{
-			await ApplyFilter.InvokeAsync(filter);
-			//for (int index = 0; index < Files.Count; index++)
-			//	if (FilteredOutFiles.Contains(index))
-			//		Files[index].Hide();
-			//	else
-			//		Files[index].Unhide();
+			SelectedFilter = filter;
+			SearchFile();
 		}
 
 		protected async Task SearchInputChanged(string searchInput)
 		{
-			if (string.IsNullOrEmpty(searchInput))
-				Files.ForEach(f => f.Unhide());
+			SearchInput = searchInput;
+			SearchFile();
+		}
+
+		private void SearchFile()
+		{
+			if (string.IsNullOrEmpty(SearchInput))
+			{
+				if (SelectedFilter == "All")
+					Files.ForEach(f => f.Unhide());
+				else if (SelectedFilter == "Root")
+					Files.ForEach(f =>
+					{
+						if (f.Folder == FilterFolder[SelectedFilter])
+							f.Unhide();
+						else
+							f.Hide();
+					});
+				else
+					Files.ForEach(f =>
+					{
+						if (f.Folder.Contains(FilterFolder[SelectedFilter]))
+							f.Unhide();
+						else
+							f.Hide();
+					});
+			}
 			else
-				Files.ForEach(f =>
-				{
-					if (f.Name.ToLower().Contains(searchInput.ToLower()))
-						f.Unhide();
-					else
-						f.Hide();
-				});
+			{
+				if (SelectedFilter == "All")
+					Files.ForEach(f => { if (f.Name.ToLower().Contains(SearchInput)) f.Unhide(); else f.Hide(); });
+				else if (SelectedFilter == "Root")
+					Files.ForEach(f =>
+					{
+						if (f.Folder == FilterFolder[SelectedFilter])
+							f.Unhide();
+						else
+							f.Hide();
+					});
+				else
+					Files.ForEach(f =>
+					{
+						if (f.Folder.Contains(FilterFolder[SelectedFilter]))
+							f.Unhide();
+						else
+							f.Hide();
+					});
+				//Files.ForEach(f => f.Unhide());
+				//else
+				//		Files.ForEach(f =>
+				//		{
+				//			if (f.Name.ToLower().Contains(searchInput.ToLower()))
+				//				f.Unhide();
+				//			else
+				//				f.Hide();
+				//		});
+			}
 		}
 
 		protected async Task OnFileClick(MouseEventArgs e, CFile file)
diff --git a/Seenginx/Pages/Nginx.razor b/Seenginx/Pages/Nginx.razor
index d2f1760..3a47d09 100644
--- a/Seenginx/Pages/Nginx.razor
+++ b/Seenginx/Pages/Nginx.razor
@@ -2,8 +2,8 @@
 @page "/nginx"
 
 
-<FilesWithEditor CFile="ConfigFile" Filters="Filters" FilteredOutFiles="FilteredOutFiles" Files="ConfigFiles"
-								 SelectedFile="SelectedFile" SelectedFileChanged="SelectedFileChanged" ApplyFilter="ApplyFilter"
+<FilesWithEditor CFile="ConfigFile" Filters="Filters" Files="ConfigFiles" FilterFolder="FilterFolder"
+								 SelectedFile="SelectedFile" SelectedFileChanged="SelectedFileChanged"
 								 AddFile="AddFile" UpdateFile="UpdateFile" DeleteFile="DeleteFile" >
 	<CreateDialog>
 
diff --git a/Seenginx/Pages/Nginx.razor.cs b/Seenginx/Pages/Nginx.razor.cs
index 60d6049..4ca6575 100644
--- a/Seenginx/Pages/Nginx.razor.cs
+++ b/Seenginx/Pages/Nginx.razor.cs
@@ -23,7 +23,7 @@ namespace Seenginx.Pages
 		public List<string> Filters { get; set; } = new List<string>();
 		public List<int> FilteredOutFiles { get; set; } = new List<int>();
 
-		private Dictionary<string, string> FilterFolder { get; set; } = new Dictionary<string, string>();
+		public Dictionary<string, string> FilterFolder { get; set; } = new Dictionary<string, string>();
 
 		protected override async Task OnInitializedAsync()
 		{
@@ -37,28 +37,6 @@ namespace Seenginx.Pages
 			await base.OnInitializedAsync();
 		}
 
-		public async Task ApplyFilter(string filter)
-		{
-			if (filter == "All")
-				ConfigFiles.ForEach(f => f.Unhide());
-			else if (filter == "Root")
-				ConfigFiles.ForEach(f =>
-				{
-					if (f.Folder == FilterFolder[filter])
-						f.Unhide();
-					else
-						f.Hide();
-				});
-			else
-				ConfigFiles.ForEach(f =>
-				{
-					if (f.Folder.Contains(FilterFolder[filter]))
-						f.Unhide();
-					else
-						f.Hide();
-				});
-		}
-
 		public async Task SelectedFileChanged(ConfigFile configFile)
 		{
 			SelectedFile = configFile;