diff --git a/OpenNest/Controls/PlateRenderer.cs b/OpenNest/Controls/PlateRenderer.cs
index d4b5a83..cb9e7a5 100644
--- a/OpenNest/Controls/PlateRenderer.cs
+++ b/OpenNest/Controls/PlateRenderer.cs
@@ -433,7 +433,15 @@ namespace OpenNest.Controls
                     if (program != null)
                     {
                         var savedPos = pos;
-                        pos = new Vector(savedPos.X + subpgm.Offset.X, savedPos.Y + subpgm.Offset.Y);
+                        var holePos = new Vector(savedPos.X + subpgm.Offset.X, savedPos.Y + subpgm.Offset.Y);
+
+                        // Draw rapid from current position to hole center
+                        if (!(skipFirstRapid && !firstRapidSkipped))
+                            DrawLine(g, pos, holePos, view.ColorScheme.RapidPen);
+                        else
+                            firstRapidSkipped = true;
+
+                        pos = holePos;
                         DrawRapids(g, program, ref pos);
                         pos = savedPos;
                     }