diff --git a/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
index 69be1f3a63..740f1f5bb9 100644
--- a/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
+++ b/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
@@ -654,6 +654,14 @@ void drawItems(SpriteBatch spriteBatch, Point offset, int startObjectArea, int e
                         lastLabelPosition = drawMilePost(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
                         break;
 
+                    case Train.TrainObjectItem.TRAINOBJECTTYPE.FACING_SWITCH:
+                        drawSwitch(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
+                        break;
+
+                    case Train.TrainObjectItem.TRAINOBJECTTYPE.REVERSAL:
+                        drawReversal(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
+                        break;
+
                     default:     // capture unkown item
                         break;
                 }
@@ -670,6 +678,9 @@ void drawItems(SpriteBatch spriteBatch, Point offset, int startObjectArea, int e
                     case Train.TrainObjectItem.TRAINOBJECTTYPE.REVERSAL:
                         drawReversal(spriteBatch, offset, startObjectArea, endObjectArea, zeroPoint, maxDistance, distanceFactor, firstLabelPosition, forward, lastLabelPosition, thisItem, ref firstLabelShown);
                         break;
+
+                    default:
+                        break;
                 }
             }
             // reverse display of signals to have correct superposition