diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 62f609b6d1..1901203d5c 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -200,6 +200,7 @@ static void TerraformClick_BuyLand(Window *w)
 static void TerraformClick_Trees(Window *w)
 {
 	/* This button is NOT a place-push-button, so don't treat it as such */
+	w->HandleButtonClick(TTW_PLANT_TREES);
 	ShowBuildTreesToolbar();
 }
 
@@ -250,6 +251,12 @@ struct TerraformToolbarWindow : Window {
 		if (widget >= TTW_BUTTONS_START) _terraform_button_proc[widget - TTW_BUTTONS_START](this);
 	}
 
+	virtual void OnTimeout()
+	{
+		this->RaiseWidget(TTW_PLANT_TREES);
+		this->SetWidgetDirty(TTW_PLANT_TREES);
+	}
+
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
 		int num = CheckHotkeyMatch(terraform_hotkeys, keycode, this);