diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 84e4e3c512..7d57a98f2b 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -363,6 +363,8 @@ void PlaceTreesRandomly()
  */
 void RemoveAllTrees()
 {
+	if (_game_mode != GM_EDITOR) return;
+
 	for(uint i = 0; i < MapSizeX(); i++) {
 		for(uint j = 0; j < MapSizeY(); j++) {
 			TileIndex tile = TileXY(i, j);
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index d13fc5c865..246b329616 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -80,7 +80,7 @@ public:
 			return;
 		}
 
-		if (widget != WID_BT_MANY_RANDOM) return;
+		if (widget != WID_BT_MANY_RANDOM && widget != WID_BT_REMOVE_ALL) return;
 
 		if (_game_mode != GM_EDITOR) {
 			size->width = 0;