diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index c30e63017e..1d93028720 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -254,7 +254,14 @@ static void GenericPlaceSignals(TileIndex tile)
 
 static void PlaceRail_Bridge(TileIndex tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_BUILD_BRIDGE);
+	if (IsBridgeTile(tile)) {
+		TileIndex other_tile = GetOtherTunnelBridgeEnd(tile);
+		Window *w = GetCallbackWnd();
+		Point pt = {0, 0};
+		if (w != NULL) w->OnPlaceMouseUp(VPM_X_OR_Y, DDSP_BUILD_BRIDGE, pt, tile, other_tile);
+	} else {
+		VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_BUILD_BRIDGE);
+	}
 }
 
 /** Command callback for building a tunnel */
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 0fdb7c183b..bacf1df852 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -25,6 +25,7 @@
 #include "sound_func.h"
 #include "company_func.h"
 #include "tunnelbridge.h"
+#include "tunnelbridge_map.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
 
@@ -112,7 +113,14 @@ static void PlaceRoad_AutoRoad(TileIndex tile)
 
 static void PlaceRoad_Bridge(TileIndex tile)
 {
-	VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_BUILD_BRIDGE);
+	if (IsBridgeTile(tile)) {
+		TileIndex other_tile = GetOtherTunnelBridgeEnd(tile);
+		Window *w = GetCallbackWnd();
+		Point pt = {0, 0};
+		if (w != NULL) w->OnPlaceMouseUp(VPM_X_OR_Y, DDSP_BUILD_BRIDGE, pt, tile, other_tile);
+	} else {
+		VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_BUILD_BRIDGE);
+	}
 }