diff --git a/src/train_gui.cpp b/src/train_gui.cpp
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -98,6 +98,8 @@ void DrawTrainImage(const Vehicle *v, in
 					/* Set the highlight position */
 					highlight_l = WagonLengthToPixels(dx) + 1;
 					highlight_r = WagonLengthToPixels(dx + width) + 1;
+				} else if (_cursor.vehchain && highlight_r != 0) {
+					highlight_r += WagonLengthToPixels(width);
 				}
 			}
 		}