diff --git a/ai/default/default.c b/ai/default/default.c
index 6794d9f26b..379f4516e2 100644
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -2806,6 +2806,7 @@ static bool AiCheckRoadFinished(Player *p)
 	are.dest = p->ai.cur_tile_b;
 	tile = TILE_MASK(p->ai.cur_tile_a + TileOffsByDiagDir(dir));
 
+	if (IsRoadStopTile(tile) || IsTileDepotType(tile, TRANSPORT_ROAD)) return false;
 	bits = GetTileTrackStatus(tile, TRANSPORT_ROAD) & _ai_road_table_and[dir];
 	if (bits == 0) return false;
 
diff --git a/pathfind.c b/pathfind.c
index 9b8cfc3ec9..1e724c632c 100644
--- a/pathfind.c
+++ b/pathfind.c
@@ -294,9 +294,9 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
 	if (tpf->tracktype == TRANSPORT_ROAD) {
 		// road stops and depots now have a track (r4419)
 		// don't enter road stop from the back
-		if (IsRoadStopTile(tile) && GetRoadStopDir(tile) == direction) return;
+		if (IsRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) return;
 		// don't enter road depot from the back
-		if (IsTileDepotType(tile, TRANSPORT_ROAD) && GetRoadDepotDirection(tile) == direction) return;
+		if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
 	}
 
 	tpf->rd.cur_length++;