diff --git a/Phi/widgets/map.js b/Phi/widgets/map.js
index 246c3636a..71ffd5237 100644
--- a/Phi/widgets/map.js
+++ b/Phi/widgets/map.js
@@ -48,6 +48,9 @@ define(
 
                 self.toggleFollowAircraft = function(a) {
                     self.followAircraft(!self.followAircraft());
+                    if( self.followAircraft() ) {
+                        self.map.setView(self.mapCenter());
+                    }
                 }
                 
                 self.altitude = ko.observable(0).extend({