diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index d8c5c4212..ab7ed7d4d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -21,6 +21,7 @@
  - fixed #10774: i18n Asset::Storyarchive tag asset url
  - fixed #10657: Story Topic: delete story displays failsafe
  - fixed SMS/Email notification handling (Patrick Donelan, SDH Consulting)
+ - fixed #10624: map template problem with floats
 
 7.7.17
  - fixed #10697: Story: Image crowds text
diff --git a/docs/upgrades/packages-7.7.18/default-map-view.wgpkg b/docs/upgrades/packages-7.7.18/default-map-view.wgpkg
new file mode 100644
index 000000000..eac4fc8e2
Binary files /dev/null and b/docs/upgrades/packages-7.7.18/default-map-view.wgpkg differ
diff --git a/www/extras/yui-webgui/build/map/map.js b/www/extras/yui-webgui/build/map/map.js
index f98561066..8570b2f67 100644
--- a/www/extras/yui-webgui/build/map/map.js
+++ b/www/extras/yui-webgui/build/map/map.js
@@ -136,6 +136,7 @@ WebGUI.Map.editPointSave
 WebGUI.Map.focusOn
 = function ( assetId ) {
     var marker  = WebGUI.Map.markers[assetId];
+    if ( !marker ) return;
     var map     = marker.map;
     var infoWin = marker.infoWin;
     if ( map.getZoom() < 5 ) {