diff --git a/app/static/js/dm.js b/app/static/js/dm.js
index d3dc4a7..c7fdf2f 100644
--- a/app/static/js/dm.js
+++ b/app/static/js/dm.js
@@ -2108,7 +2108,10 @@ function openRepeaterMapPicker() {
                     checkUniquenessWarning(_repeatersCache, hashSize);
                 }
             }
-            modal.hide();
+            // Reset selection for next pick
+            _rptMapSelectedRepeater = null;
+            if (addBtn) addBtn.disabled = true;
+            if (selectedLabel) selectedLabel.textContent = 'Click a repeater on the map';
         };
     }
 
diff --git a/app/templates/dm.html b/app/templates/dm.html
index 966e85e..9a8abfa 100644
--- a/app/templates/dm.html
+++ b/app/templates/dm.html
@@ -426,7 +426,7 @@
                 </div>
                 <div class="modal-footer py-2">
                     <span class="me-auto small text-muted" id="rptMapSelected">Click a repeater on the map</span>
-                    <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
                     <button type="button" class="btn btn-sm btn-primary" id="rptMapAddBtn" disabled>Add</button>
                 </div>
             </div>