diff --git a/static/galene.html b/static/galene.html
index 0782292..bd31c52 100644
--- a/static/galene.html
+++ b/static/galene.html
@@ -37,12 +37,12 @@
 
               <ul class="nav-menu">
                 <li>
-                  <button id="presentbutton" class="invisible btn btn-success">
+                  <button id="presentbutton" class="invisible btn btn-success" aria-label="Enable camera and microphone">
                     <i class="fas fa-play" aria-hidden="true"></i><span class="nav-text"> Enable</span>
                   </button>
                 </li>
                 <li>
-                  <button id="unpresentbutton" class="invisible btn btn-cancel">
+                  <button id="unpresentbutton" class="invisible btn btn-cancel" aria-label="Disable camera and microphone">
                     <i class="fas fa-stop" aria-hidden="true"></i><span class="nav-text"> Disable</span>
                   </button>
                 </li>
@@ -77,7 +77,7 @@
                   <div id="chat-announcements" aria-live="polite" aria-atomic="true" class="sr-only"></div>
                   <div class="reply">
                     <form id="inputform">
-                      <textarea id="input" class="form-reply"></textarea>
+                      <textarea id="input" class="form-reply" aria-label="Message or /command"></textarea>
                       <input id="inputbutton" type="submit" value="&#10148;" class="btn btn-default" aria-label="Send message"/>
                     </form>
                   </div>
diff --git a/static/galene.js b/static/galene.js
index bf68e59..f0c3fd1 100644
--- a/static/galene.js
+++ b/static/galene.js
@@ -2577,7 +2577,11 @@ function makeContextualMenuAccessible(menuElement) {
             menuItems[currentIndex].focus();
         } else if(e.key === 'Enter' || e.key === ' ') {
             e.preventDefault();
-            menuItems[currentIndex].click();
+            // Click the parent li element which has the actual click handler
+            let parentLi = menuItems[currentIndex].parentElement;
+            if(parentLi) {
+                parentLi.click();
+            }
         }
     });
 }