diff --git a/crouton.php b/crouton.php
index fd69548..973a9c5 100644
--- a/crouton.php
+++ b/crouton.php
@@ -5,7 +5,7 @@
 Description: A tabbed based display for showing meeting information.
 Author: bmlt-enabled
 Author URI: https://bmlt.app
-Version: 3.18.10
+Version: 3.18.11
 */
 /* Disallow direct access to the plugin file */
 if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {
diff --git a/croutonjs/meetingMap/js/meeting_map.js b/croutonjs/meetingMap/js/meeting_map.js
index bdfd3cb..9233a69 100644
--- a/croutonjs/meetingMap/js/meeting_map.js
+++ b/croutonjs/meetingMap/js/meeting_map.js
@@ -297,6 +297,7 @@ function MeetingMap(inConfig) {
 	var g_suspendedFullscreen = false;
 	function closeModalWindow(modal) {
 		gDelegate.modalOff();
+		activeModal = null;
 		if (!modal.classList.contains("modal"))
 			return closeModalWindow(modal.parentNode);
 		modal.style.display = "none";
@@ -307,12 +308,20 @@ function MeetingMap(inConfig) {
 			}
 		}
 	}
+	var activeModal = null;
+	document.addEventListener("keydown", function(event) {
+		if (activeModal && event.key == "Escape") {
+			closeModalWindow(activeModal);
+		}
+	}, true);
 	function openModalWindow(modal) {
 		if (isFullscreen()) {
 			g_suspendedFullscreen = true;
 			toggleFullscreen();
 		}
 		modal.style.display = "block";
+		modal.focus();
+		activeModal = modal;
 		dd = document.getElementById("map-menu-dropdown");
 		if (dd) dd.style.display = "none";
 		gDelegate.modalOn();
diff --git a/croutonjs/src/js/crouton-default-templates.js b/croutonjs/src/js/crouton-default-templates.js
index d6fadc8..1311477 100644
--- a/croutonjs/src/js/crouton-default-templates.js
+++ b/croutonjs/src/js/crouton-default-templates.js
@@ -36,7 +36,7 @@ var croutonDefaultTemplates = {
 		"{{#isNotTemporarilyClosed this}}",
 		"    {{#unless (hasFormats 'VM' this)}}",
 		"        <div>",
-		"            <a onclick='crouton.meetingModal({{this.id_bigint}})' id='map-button' class='btn btn-primary btn-xs'>",
+		"            <a onclick='crouton.meetingModal({{this.id_bigint}})' tabindex='0' href='#' id='map-button' class='btn btn-primary btn-xs'>",
 		"				<span class='glyphicon glyphicon-search' aria-hidden='true'></span>",
 		"				{{getWord 'meeting details'}}",
 		"			</a>",
@@ -66,10 +66,10 @@ var croutonDefaultTemplates = {
 		"{{/if}}"
 	].join('\n'),
 	meeting_modal_template: [
-		"<a onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>",
+		"<a tabindex='0' href='#' onclick='crouton.meetingModal({{this.id_bigint}})'><span class='glyphicon glyphicon-search' aria-hidden='true'></span>{{this.meeting_name}}</a>",
 	].join('\n'),
 	meetingpage_frame_template: `
-	<div id="meeting_modal" class="modal bootstrap-bmlt" style="display: none;">
+	<div id="meeting_modal" class="modal bootstrap-bmlt" style="display: none;" tabindex="-1" >
 	<div class="modal-content">
         <span class="modal-title">{{getWord "Meeting Details"}}</span><span id="close_meeting_details" class="modal-close">×</span>
 		<table id="meeting-details-table" class="bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack meeting-details">
@@ -85,9 +85,9 @@ var croutonDefaultTemplates = {
     		</tbody>
 		</table>
 		<div>
-			<a id="map-button" class="btn btn-primary btn-xs" href="{{{this.meeting_details_url}}}" target="_blank" rel="noopener noreferrer" style="float:left">
+			<a id="map-button" class="btn btn-primary btn-xs" href="{{{this.meeting_details_url}}}" tabindex="0" target="_blank" rel="noopener noreferrer" style="float:left">
 				{{getWord "Meeting Page"}}</a>
-			<a id="map-button" class="btn btn-primary btn-xs modal-close" style="float:right">
+			<a id="map-button" class="btn btn-primary btn-xs modal-close" tabindex="0" style="float:right">
 				{{getWord "Close"}}</a>
 		</div>
 	</div></div>`,
diff --git a/readme.txt b/readme.txt
index 28733ee..3b6b5ae 100644
--- a/readme.txt
+++ b/readme.txt
@@ -36,6 +36,9 @@ https://demo.bmlt.app/crouton
 
 == Changelog ==
 
+= 3.18.11 =
+* Improve accessibility
+
 = 3.18.10 =
 * Move QR code generation to a different service.
 * Arabic Translation