diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 1c3d0f5e8f..41f2fe7343 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -325,9 +325,7 @@ TileIndex Ship::GetOrderStationLocation(StationID station)
 		} else {
 			const Dock* dock = GetBestDock(this, st);
 
-			DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(dock->sloped));
-			direction = ReverseDiagDir(direction);
-
+			DiagDirection direction = DiagdirBetweenTiles(dock->sloped, dock->flat);
 			return dock->flat + TileOffsByDiagDir(direction);
 		}
 	} else {
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 90a9b1eb22..257318bada 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2704,9 +2704,7 @@ static CommandCost RemoveDock(TileIndex tile, DoCommandFlag flags)
 	TileIndex tile1 = removing_dock->sloped;
 	TileIndex tile2 = removing_dock->flat;
 
-	DiagDirection direction = GetInclinedSlopeDirection(GetTileSlope(removing_dock->sloped));
-	direction = ReverseDiagDir(direction);
-
+	DiagDirection direction = DiagdirBetweenTiles(removing_dock->sloped, removing_dock->flat);
 	TileIndex docking_location = removing_dock->flat + TileOffsByDiagDir(direction);
 
 	ret = EnsureNoVehicleOnGround(tile1);