diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp
index 6343a17b..8d15700b 100644
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@@ -1679,7 +1679,8 @@ void GUI::writeSettings()
 	if (_showMapAction->isChecked() != SHOW_MAP_DEFAULT)
 		settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked());
 	if (_showCoordinatesAction->isChecked() != SHOW_COORDINATES_DEFAULT)
-		settings.setValue(SHOW_COORDINATES_SETTING, _showMapAction->isChecked());
+		settings.setValue(SHOW_COORDINATES_SETTING,
+		  _showCoordinatesAction->isChecked());
 	settings.endGroup();
 
 	settings.beginGroup(GRAPH_SETTINGS_GROUP);
diff --git a/src/GUI/mapview.cpp b/src/GUI/mapview.cpp
index 47fb4f68..489b5119 100644
--- a/src/GUI/mapview.cpp
+++ b/src/GUI/mapview.cpp
@@ -39,6 +39,7 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setRenderHint(QPainter::Antialiasing, true);
 	setAcceptDrops(false);
+	setMouseTracking(true);
 
 	_mapScale = new ScaleItem();
 	_mapScale->setZValue(2.0);
@@ -751,7 +752,6 @@ void MapView::showPOILabels(bool show)
 void MapView::showCoordinates(bool show)
 {
 	_coordinates->setVisible(show);
-	setMouseTracking(show);
 }
 
 void MapView::setPOIOverlap(bool overlap)