diff --git a/Src/Utilities/pcpatrflex/PcPatrFLExDll/PcPatrFLExForm.cs b/Src/Utilities/pcpatrflex/PcPatrFLExDll/PcPatrFLExForm.cs
index 14d73d28ec..1bf5843be9 100644
--- a/Src/Utilities/pcpatrflex/PcPatrFLExDll/PcPatrFLExForm.cs
+++ b/Src/Utilities/pcpatrflex/PcPatrFLExDll/PcPatrFLExForm.cs
@@ -254,16 +254,16 @@ public void FillTextsListBox()
 				if (selectedText != null)
 				{
 					lbTexts.SelectedIndex = Texts.IndexOf(selectedText);
-				}
-				var selectedSegment = SegmentsInListBox.Where(s => s.Segment.Guid.ToString() == RetrievedLastSegment).FirstOrDefault();
-				if (selectedSegment != null)
-				{
-					int index = SegmentsInListBox.IndexOf(selectedSegment);
-					lbSegments.SelectedIndex = index;
-					if (lbSegments.GetSelected(0) && index != 0)
+					var selectedSegment = SegmentsInListBox.Where(s => s.Segment.Guid.ToString() == RetrievedLastSegment).FirstOrDefault();
+					if (selectedSegment != null)
 					{
-						// Only select the non-initial one
-						lbSegments.SetSelected(0, false);
+						int index = SegmentsInListBox.IndexOf(selectedSegment);
+						lbSegments.SelectedIndex = index;
+						if (lbSegments.GetSelected(0) && index != 0)
+						{
+							// Only select the non-initial one
+							lbSegments.SetSelected(0, false);
+						}
 					}
 				}
 			}