A computer-implemented method includes determining a current location of a mobile device, displaying in a map viewport a first map area surrounding the current location of the mobile device and displaying on the first map area a graphical current location indicator representing the current location of the mobile device. The method further entails repositioning the graphical current location indicator relative to the map viewport by shifting the first map area to a partially overlapping second map area that includes both a new map area and a portion of the first map area that contains the graphical current location indicator.