diff --git a/app/javascript/controllers/non_geo_controller.js b/app/javascript/controllers/non_geo_controller.js
index f8b86643..1a7775f2 100644
--- a/app/javascript/controllers/non_geo_controller.js
+++ b/app/javascript/controllers/non_geo_controller.js
@@ -55,13 +55,25 @@ export default class extends Controller {
     return [this.lat, this.lng]
   }
 
+  get svgOverlay () {
+    return this.overlayTarget.querySelector('svg');
+  }
+
+  get bounds () {
+    return [
+      [0, 0],
+      [
+        this.svgOverlay.viewBox.baseVal.height,
+        this.svgOverlay.viewBox.baseVal.width,
+      ]
+    ];
+  }
+
   get map () {
     if (!this._map) {
       this._map = L.map(this.mapTarget).setView(this.coords, 13);
 
-      const bounds = [[0,0], [this.mapTarget.clientHeight, this.mapTarget.clientWidth]];
-
-      L.svgOverlay(this.overlayTarget.querySelector('svg'), bounds).addTo(this._map);
+      L.svgOverlay(this.svgOverlay, this.bounds).addTo(this._map);
 
       this._map.fitBounds(bounds);
       this._map.setMaxBounds(bounds);