diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce3bb1f3..1118ff41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# [Unreleased]
+
+### Fixed
+
+- A point popup is no longer closes when hovering over a polyline. #536
+
+### Changed
+
+- Months and years navigation is moved to a map panel on the right side of the map.
+- List of visited cities is now being shown in a map panel on the right side of the map.
+
 # 0.19.7 - 2024-12-11
 
 ### Fixed
diff --git a/app/javascript/controllers/maps_controller.js b/app/javascript/controllers/maps_controller.js
index 203c0d53..f6ea421c 100644
--- a/app/javascript/controllers/maps_controller.js
+++ b/app/javascript/controllers/maps_controller.js
@@ -925,7 +925,7 @@ export default class extends Controller {
         ${photo.type === 'video' ? '🎥 Video' : '📷 Photo'}
       </div>
     `;
-    marker.bindPopup(popupContent);
+    marker.bindPopup(popupContent, { autoClose: false });
 
     this.photoMarkers.addLayer(marker);
   }
diff --git a/app/javascript/maps/markers.js b/app/javascript/maps/markers.js
index 25760054..d1da358a 100644
--- a/app/javascript/maps/markers.js
+++ b/app/javascript/maps/markers.js
@@ -9,7 +9,7 @@ export function createMarkersArray(markersData, userSettings) {
 
       const popupContent = createPopupContent(marker, userSettings.timezone, userSettings.distanceUnit);
       let markerColor = marker[5] < 0 ? "orange" : "blue";
-      return L.circleMarker([lat, lon], { radius: 4, color: markerColor }).bindPopup(popupContent);
+      return L.circleMarker([lat, lon], { radius: 4, color: markerColor }).bindPopup(popupContent, { autoClose: false });
     });
   }
 }