diff --git a/src/ui/GameWorldView.cpp b/src/ui/GameWorldView.cpp
index a8e21dd..54047b3 100644
--- a/src/ui/GameWorldView.cpp
+++ b/src/ui/GameWorldView.cpp
@@ -571,7 +571,18 @@ void GameWorldView::placeAtTile(QPoint tile)
     {
         if (!m_sim->buildings().isTileOccupied(tile))
         {
-            m_sim->tryPlaceBuilding(type, tile, m_ghostRotation);
+            const EntityId id = m_sim->tryPlaceBuilding(type, tile, m_ghostRotation);
+            if (id != kInvalidEntityId)
+            {
+                if (type == BuildingType::TunnelEntry)
+                {
+                    m_builderType = BuildingType::TunnelExit;
+                }
+                else if (type == BuildingType::TunnelExit)
+                {
+                    m_builderType = BuildingType::TunnelEntry;
+                }
+            }
         }
     }
     else