diff --git a/static/scripts/map.js b/static/scripts/map.js
index 3ca7fbd11e7488ba01e7538ff96285eb2e7b83b7..b914908779ccf53be1a13621990d7dc31d58ebda 100644
--- a/static/scripts/map.js
+++ b/static/scripts/map.js
@@ -12,7 +12,7 @@ for (let workspace of mapData) {
 			escapeHTML(workspace.phoneNumber)
 		}</a></div><div>Email: <a href="mailto:${ escapeHTML(workspace.email) }">${
 			escapeHTML(workspace.email)
-		}</a></div><div>Website: <a href="${ escapeHTML(workspace.website) }">${
+		}</a></div><div>Website: <a href="${ escapeHTML(workspace.website) }" target="_blank">${
 			escapeHTML(workspace.website)
 		}</a></div><div>${ escapeHTML(workspace.address) }</div></div>`);
 }
diff --git a/templates/map.html b/templates/map.html
index af4c38439748711d2fda086f16c798fa2a859f14..510eda426f53213e3922df5fec0070c33fecbb0e 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -4,10 +4,10 @@
 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
 	integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
 	crossorigin=""/>
-	<!-- Make sure you put this AFTER Leaflet's CSS -->
 <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
 	integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
 	crossorigin=""></script>
+<noscript>JavaScript must be supported and enabled in the browser to support interactive maps!</noscript>
 <script>var mapData = {{ json|safe }};</script>
 <div id="map"></div>
 <script src="/static/scripts/map.js"></script>