diff --git a/GCSViews/InitialSetup.Designer.cs b/GCSViews/InitialSetup.Designer.cs
index 1bd666cee0..d8044a7c28 100644
--- a/GCSViews/InitialSetup.Designer.cs
+++ b/GCSViews/InitialSetup.Designer.cs
@@ -565,7 +565,7 @@ private void InitializeComponent()
 
         #endregion
 
-        private Controls.BackstageView.BackstageView backstageView;
+        internal Controls.BackstageView.BackstageView backstageView;
         private ConfigurationView.ConfigFirmware configFirmware1;
         private ConfigurationView.ConfigFirmwareDisabled configFirmwareDisabled1;
         private ConfigurationView.ConfigWizard configWizard1;
diff --git a/GCSViews/InitialSetup.cs b/GCSViews/InitialSetup.cs
index 7a1d895683..9f282e7beb 100644
--- a/GCSViews/InitialSetup.cs
+++ b/GCSViews/InitialSetup.cs
@@ -10,7 +10,7 @@ namespace MissionPlanner.GCSViews
 {
     public partial class InitialSetup : MyUserControl, IActivate
     {
-        internal static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        internal static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static string lastpagename = "";
 
         public InitialSetup()
diff --git a/MainV2.cs b/MainV2.cs
index 1ca041f59a..f974cc87a4 100644
--- a/MainV2.cs
+++ b/MainV2.cs
@@ -820,6 +820,11 @@ public MainV2()
 
         void comPort_MavChanged(object sender, EventArgs e)
         {
+            // when uploading a firmware we dont want to reload this screen.
+            if (instance.MyView.current.Control.GetType() == typeof(GCSViews.InitialSetup)
+                && ((GCSViews.InitialSetup)instance.MyView.current.Control).backstageView.SelectedPage.Text == "Install Firmware")
+                return;
+
             if (this.InvokeRequired)
             {
                 this.Invoke((MethodInvoker) delegate