diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 8ce2e9a5..e0c3b5a7 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -6,7 +6,7 @@
 @inject IStringLocalizer<FileManager> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_folders != null)
+@if (_initialized)
 {
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
@@ -87,6 +87,7 @@
 }
 
 @code {
+	private bool _initialized = false;
 	private List<Folder> _folders;
 	private List<File> _files = new List<File>();
 	private string _fileinputid = string.Empty;
@@ -205,6 +206,8 @@
 		_fileinputid = "FileInput_" + _guid;
 		_progressinfoid = "ProgressInfo_" + _guid;
 		_progressbarid = "ProgressBar_" + _guid;
+
+		_initialized = true;
 	}
 
 	private async Task GetFiles()