diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
index b76f18e..c570a6e 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
@@ -1,4 +1,4 @@
-@if (currVal == null)
+@if (currVal == null || isLoading)
 {
     <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
 }
@@ -49,7 +49,7 @@ else
                         <span>Template</span>
                     </div>
 
-                    @if (listValuesFiles != null && listValuesFiles.Count > 0)
+                    @if (listValuesFiles != null && listValuesFiles.Count > 0 && !string.IsNullOrEmpty(templateName))
                     {
                         <select class="col-7" @bind="@templateName">
                             @foreach (var val in listValuesFiles)
@@ -71,7 +71,7 @@ else
                     @foreach (var item in currVal)
                     {
 
-                        @if (item.Key != "Folder" && item.Key != "Template")
+                        @if (item.Key != "Folder" && item.Key != "template")
                         {
                             @if (isCombo(item.Key))
                             {
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
index 24774e8..517d5cc 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
@@ -254,8 +254,14 @@ namespace WebDoorCreator.UI.Components.Hardware
             await ReloadData(isFirst);
         }
 
+        protected bool isLoading { get; set; } = false;
+
         private async Task ReloadData(bool isFirst)
         {
+            isLoading = true;
+            await Task.Delay(1);
+            listValuesFiles = null;
+            templateName = "";
             var tempListVal = await WDCService.ListValuesGetAll(HwCode, "Folder");
             if (tempListVal != null)
             {
@@ -271,9 +277,15 @@ namespace WebDoorCreator.UI.Components.Hardware
                     if (tempListFiles != null)
                     {
                         listValuesFiles = tempListFiles.Where(x => x.Value.Contains(folderName)).ToList();
+                        if (listValuesFiles != null && listValuesFiles.Count > 0)
+                        {
+                            templateName = listValuesFiles.FirstOrDefault()?.Label!;
+                        }
                     }
                 }
             }
+            isLoading = false;
+            await InvokeAsync(StateHasChanged);
         }
 
         #endregion Private Methods