diff --git a/TGControlPanel/ControlPanel/ControlPanel.cs b/TGControlPanel/ControlPanel/ControlPanel.cs
index 228de517b7..5e88c8f0c1 100644
--- a/TGControlPanel/ControlPanel/ControlPanel.cs
+++ b/TGControlPanel/ControlPanel/ControlPanel.cs
@@ -47,7 +47,6 @@ namespace TGControlPanel
 			InitRepoPage();
 			InitBYONDPage();
 			InitServerPage();
-			InitStaticPage();
 			UpdateSelectedPanel();
 			InstancesInUse.Add(I.InstanceName, this);
 		}
@@ -97,6 +96,9 @@ namespace TGControlPanel
 				case 3: //chat
 					LoadChatPage();
 					break;
+				case 4: //static
+					InitStaticPage();
+					break;
 			}
 			Properties.Settings.Default.LastPageIndex = Panels.SelectedIndex;
 		}
diff --git a/TGControlPanel/ControlPanel/StaticPage.cs b/TGControlPanel/ControlPanel/StaticPage.cs
index 1f17132820..f944570837 100644
--- a/TGControlPanel/ControlPanel/StaticPage.cs
+++ b/TGControlPanel/ControlPanel/StaticPage.cs
@@ -12,6 +12,10 @@ namespace TGControlPanel
 		IDictionary<int, string> IndexesToPaths = new Dictionary<int, string>();
 		IList<string> EnumeratedPaths = new List<string>() { "" };
 		bool enumerating = false;
+		/// <summary>
+		/// Whether or not the static page has been initialized yet
+		/// </summary>
+		bool initializedStaticPage = false;
 
 		enum EnumResult
 		{
@@ -23,9 +27,12 @@ namespace TGControlPanel
 
 		void InitStaticPage()
 		{
+			if (initializedStaticPage)
+				return;
 			if(!Interface.ConnectToInstance().HasFlag(ConnectivityLevel.Administrator))
 				RecreateStaticButton.Visible = false;
 			BuildFileList();
+			initializedStaticPage = true;
 		}
 
 		void BuildFileList()