diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -127,6 +127,8 @@ public:
 			NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WAYPVW_VIEWPORT);
 			nvp->UpdateViewportCoordinates(this);
 			this->wp->UpdateVirtCoord();
+
+			ScrollWindowToTile(this->GetCenterTile(), this, true); // Re-center viewport.
 		}
 	}