diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 90ffd6137c..14de1ff363 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -1475,9 +1475,11 @@ public:
 
 	void UpdateBuildingHeight(uint height)
 	{
-		if (height > this->building_height) {
+		height = std::max<uint>(2, height);
+		if (height != this->building_height) {
+			int y_delta = (height - this->building_height) * ScaleGUITrad(8) * 2;
 			this->building_height = height;
-			this->ReInit();
+			this->ReInit(0, y_delta);
 		}
 	}
 
@@ -1625,6 +1627,9 @@ public:
 		if (this->vscrollList != nullptr) {
 			this->vscrollList->SetCapacityFromWidget(this, WID_BROS_NEWST_LIST);
 		}
+		if (this->vscrollMatrix != nullptr) {
+			this->GetWidget<NWidgetMatrix>(WID_BROS_MATRIX)->SetClicked(_roadstop_gui_settings.roadstop_type);
+		}
 	}
 
 	void SetStringParameters(int widget) const override {