diff --git a/index.html b/index.html
index 94e7be14..35214125 100644
--- a/index.html
+++ b/index.html
@@ -8072,7 +8072,7 @@
     <script defer src="modules/ui/editors.js?v=1.104.3"></script>
     <script defer src="modules/ui/tools.js?v=1.104.0"></script>
     <script defer src="modules/ui/world-configurator.js?v=1.104.0"></script>
-    <script defer src="modules/ui/heightmap-editor.js?v=1.104.0"></script>
+    <script defer src="modules/ui/heightmap-editor.js?v=1.104.7"></script>
     <script defer src="modules/ui/provinces-editor.js?v=1.104.0"></script>
     <script defer src="modules/ui/biomes-editor.js?v=1.99.05"></script>
     <script defer src="modules/ui/namesbase-editor.js?v=1.99.00"></script>
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 11eef739..5c167454 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -157,11 +157,7 @@ function editHeightmap(options) {
   // Exit customization mode
   function finalizeHeightmap() {
     if (viewbox.select("#heights").selectAll("*").size() < 200)
-      return tip(
-        "Insufficient land area! There should be at least 200 land cells to finalize the heightmap",
-        null,
-        "error"
-      );
+      return tip("Insufficient land area. There should be at least 200 land cells!", null, "error");
     if (byId("imageConverter").offsetParent) return tip("Please exit the Image Conversion mode first", null, "error");
 
     delete window.edits; // remove global variable
@@ -173,6 +169,7 @@ function editHeightmap(options) {
     if (byId("options").querySelector(".tab > button.active").id === "toolsTab") toolsContent.style.display = "block";
     layersPreset.disabled = false;
     exitCustomization.style.display = "none"; // hide finalize button
+
     restoreDefaultEvents();
     clearMainTip();
     closeDialogs();
@@ -187,6 +184,7 @@ function editHeightmap(options) {
     else if (mode === "risk") restoreRiskedData();
 
     // restore initial layers
+    drawFeatures();
     byId("heights").remove();
     turnButtonOff("toggleHeight");
     document
@@ -250,8 +248,6 @@ function editHeightmap(options) {
     Provinces.getPoles();
     BurgsAndStates.defineBurgFeatures();
 
-    drawStateLabels();
-
     Rivers.specify();
     Features.specify();
 
@@ -434,8 +430,6 @@ function editHeightmap(options) {
       c.center = findCell(c.x, c.y);
     }
 
-    drawStateLabels();
-
     if (erosionAllowed) {
       Rivers.specify();
       Lakes.generateName();
diff --git a/versioning.js b/versioning.js
index dea1a3dd..fa4f2cb4 100644
--- a/versioning.js
+++ b/versioning.js
@@ -12,7 +12,7 @@
  *
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
-const VERSION = "1.104.6";
+const VERSION = "1.104.7";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {