diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index f7ae4cfc3e..4b8928f9b1 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -290,7 +290,6 @@ struct BuildDocksToolbarWindow : Window {
 		DeleteWindowById(WC_BUILD_STATION, TRANSPORT_WATER);
 		DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_WATER);
 		DeleteWindowById(WC_SELECT_STATION, 0);
-		DeleteWindowByClass(WC_BUILD_BRIDGE);
 	}
 
 	virtual void SelectLastTool()
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 69e079fca4..a5f3f1bc20 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -37,6 +37,7 @@
 
 #include "station_map.h"
 #include "tunnelbridge_map.h"
+#include "build_confirmation_func.h"
 
 #include "widgets/rail_widget.h"
 
@@ -775,7 +776,7 @@ struct BuildRailToolbarWindow : Window {
 		DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_RAIL);
 		DeleteWindowById(WC_BUILD_WAYPOINT, TRANSPORT_RAIL);
 		DeleteWindowById(WC_SELECT_STATION, 0);
-		DeleteWindowByClass(WC_BUILD_BRIDGE);
+		if (!ConfirmationWindowShown()) DeleteWindowByClass(WC_BUILD_BRIDGE);
 	}
 
 	virtual void SelectLastTool()
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 80c6b34428..77617de1ff 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -29,6 +29,7 @@
 #include "hotkeys.h"
 #include "road_gui.h"
 #include "zoom_func.h"
+#include "build_confirmation_func.h"
 
 #include "widgets/road_widget.h"
 
@@ -550,7 +551,7 @@ struct BuildRoadToolbarWindow : Window {
 		DeleteWindowById(WC_TRUCK_STATION, TRANSPORT_ROAD);
 		DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_ROAD);
 		DeleteWindowById(WC_SELECT_STATION, 0);
-		DeleteWindowByClass(WC_BUILD_BRIDGE);
+		if (!ConfirmationWindowShown()) DeleteWindowByClass(WC_BUILD_BRIDGE);
 	}
 
 	virtual void SelectLastTool()
diff --git a/src/window.cpp b/src/window.cpp
index a0382f78df..46935e7a31 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1441,8 +1441,9 @@ void Window::InitializeData(WindowNumber window_number)
 	this->window_number = window_number;
 
 	if (this->window_class != WC_BUILD_CONFIRMATION &&
-			this->window_class != WC_TOOLTIPS &&
-			this->window_class != WC_NEWS_WINDOW) {
+		this->window_class != WC_TOOLTIPS &&
+		this->window_class != WC_NEWS_WINDOW &&
+		this->window_class != WC_BUILD_BRIDGE) {
 		HideBuildConfirmationWindow();
 	}