diff --git a/GCSViews/FlightPlanner.cs b/GCSViews/FlightPlanner.cs
index f81a128950..23979cb9eb 100644
--- a/GCSViews/FlightPlanner.cs
+++ b/GCSViews/FlightPlanner.cs
@@ -1403,8 +1403,11 @@ private void CreateAndDisplayOverlay(string overlayId, List<MAVLink.mavlink_miss
                 {
                     if (TXT_WPRad.Text == "") TXT_WPRad.Text = startupWPradius;
                     wpRadius = double.Parse(TXT_WPRad.Text) / CurrentState.multiplieralt;
-                    if (TXT_loiterrad.Text == "") TXT_loiterrad.Text = "30";
-                    loiterRadius = double.Parse(TXT_loiterrad.Text) / CurrentState.multiplieralt;
+                    if (TXT_loiterrad.Visible)
+                    {
+                        if (TXT_loiterrad.Text == "") TXT_loiterrad.Text = "30";
+                        loiterRadius = double.Parse(TXT_loiterrad.Text) / CurrentState.multiplieralt;
+                    }
                 }
                 catch (FormatException)
                 {
@@ -6263,18 +6266,21 @@ private void setWPParams()
 
                 try
                 {
-                    TXT_loiterrad.Enabled = false;
+                    TXT_loiterrad.Visible = false;
+                    label5.Visible = false;
                     if (param.ContainsKey("LOITER_RADIUS"))
                     {
                         TXT_loiterrad.Text =
                             (((double) param["LOITER_RADIUS"] * CurrentState.multiplierdist)).ToString();
-                        TXT_loiterrad.Enabled = true;
+                        TXT_loiterrad.Visible = true;
+                        label5.Visible = true;
                     }
                     else if (param.ContainsKey("WP_LOITER_RAD"))
                     {
                         TXT_loiterrad.Text =
                             (((double) param["WP_LOITER_RAD"] * CurrentState.multiplierdist)).ToString();
-                        TXT_loiterrad.Enabled = true;
+                        TXT_loiterrad.Visible = true;
+                        label5.Visible = true;
                     }
 
                     log.Info("param LOITER_RADIUS " + TXT_loiterrad.Text);