Index: viewport.c
===================================================================
--- viewport.c	(revision 6355)
+++ viewport.c	(working copy)
@@ -1894,7 +1894,10 @@
 	// redraw selection
 	if (_thd.drawstyle != _thd.new_drawstyle ||
 			_thd.pos.x != _thd.new_pos.x || _thd.pos.y != _thd.new_pos.y ||
-			_thd.size.x != _thd.new_size.x || _thd.size.y != _thd.new_size.y) {
+			_thd.size.x != _thd.new_size.x || _thd.size.y != _thd.new_size.y ||
+			_thd.outersize.x != _thd.new_outersize.x ||
+			_thd.outersize.y != _thd.new_outersize.y) {
+
 		// clear the old selection?
 		if (_thd.drawstyle) SetSelectionTilesDirty();
 
@@ -2221,6 +2224,7 @@
 	}
 
 	SetTileSelectSize(1, 1);
+	SetTileSelectBigSize(0, 0, 0, 0);
 
 	_thd.make_square_red = false;
 
Index: rail_gui.c
===================================================================
--- rail_gui.c	(revision 6355)
+++ rail_gui.c	(working copy)
@@ -649,6 +649,8 @@
 
 		if (_station_show_coverage)
 			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
+		else
+			SetTileSelectBigSize(0, 0, 0, 0);
 
 		/* Update buttons for correct spread value */
 		w->disabled_state = 0;