diff --git a/src/TSMapEditor/UI/CursorActions/PlaceTubeCursorAction.cs b/src/TSMapEditor/UI/CursorActions/PlaceTubeCursorAction.cs
index 737c7567f..1dcaa9639 100644
--- a/src/TSMapEditor/UI/CursorActions/PlaceTubeCursorAction.cs
+++ b/src/TSMapEditor/UI/CursorActions/PlaceTubeCursorAction.cs
@@ -241,14 +241,18 @@ public override void LeftClick(Point2D cellCoords)
                 points.Add(cellCoords);
                 RefreshTube();
                 TubeRefreshHelper.MapViewRefreshTube(tube, CursorActionTarget.MutationTarget);
-                lastClickedCell = cellCoords;
-                lastClickedCellDateTime = DateTime.Now;
             }
             else
             {
                 if (points.Count > 1 && lastClickedCell == cellCoords && DateTime.Now - lastClickedCellDateTime < TimeSpan.FromSeconds(DoubleClickTime))
+                {
                     ConfirmTube();
+                    return;
+                }
             }
+
+            lastClickedCell = cellCoords;
+            lastClickedCellDateTime = DateTime.Now;
         }
     }
 }