diff --git a/src/Triangle.Viewer/Topology/TopologyControlView.cs b/src/Triangle.Viewer/Topology/TopologyControlView.cs
index 351684e..c22ad5c 100644
--- a/src/Triangle.Viewer/Topology/TopologyControlView.cs
+++ b/src/Triangle.Viewer/Topology/TopologyControlView.cs
@@ -24,23 +24,7 @@ namespace MeshExplorer.Topology
 
         public void SetTriangle(ITriangle tri)
         {
-            if (tri != null)
-            {
-                lbTriangle.Text = tri.ID.ToString();
-
-                lbV0.Text = tri.GetVertexID(0).ToString();
-                lbV1.Text = tri.GetVertexID(1).ToString();
-                lbV2.Text = tri.GetVertexID(2).ToString();
-
-                lbN0.Text = tri.GetNeighborID(0).ToString();
-                lbN1.Text = tri.GetNeighborID(1).ToString();
-                lbN2.Text = tri.GetNeighborID(2).ToString();
-
-                lbS0.Text = GetSegmentString(tri.GetSegment(0));
-                lbS1.Text = GetSegmentString(tri.GetSegment(1));
-                lbS2.Text = GetSegmentString(tri.GetSegment(2));
-            }
-            else
+            if (tri == null || tri.ID < 0)
             {
                 lbTriangle.Text = "-";
 
@@ -56,6 +40,22 @@ namespace MeshExplorer.Topology
                 lbS1.Text = "-";
                 lbS2.Text = "-";
             }
+            else
+            {
+                lbTriangle.Text = tri.ID.ToString();
+
+                lbV0.Text = tri.GetVertexID(0).ToString();
+                lbV1.Text = tri.GetVertexID(1).ToString();
+                lbV2.Text = tri.GetVertexID(2).ToString();
+
+                lbN0.Text = tri.GetNeighborID(0).ToString();
+                lbN1.Text = tri.GetNeighborID(1).ToString();
+                lbN2.Text = tri.GetNeighborID(2).ToString();
+
+                lbS0.Text = GetSegmentString(tri.GetSegment(0));
+                lbS1.Text = GetSegmentString(tri.GetSegment(1));
+                lbS2.Text = GetSegmentString(tri.GetSegment(2));
+            }
         }
 
         private string GetSegmentString(ISegment seg)