diff --git a/service.js b/service.js
index ebc978c..0b7ea1e 100644
--- a/service.js
+++ b/service.js
@@ -361,8 +361,10 @@ class BesService {
           e.stopPropagation()
           this.acceptReplacement()
         }
+        break
       case 'Escape':
         this.dismissPopup()
+        break
       default:
         break
     }
@@ -1176,7 +1178,7 @@ class BesService {
   }
 
   /**
-   * This function calculates / finds the next mistake.
+   * This function finds the next/previous mistake.
    * @param {Number} direction Navigation direction: 1 for next, -1 for previous
    * @returns
    */
@@ -2925,6 +2927,12 @@ class BesPopup extends HTMLElement {
         }
         .bes-replacement-btn:hover{
           background-color: #1976f0;
+        }
+          .bes-replacement-btn:focus{
+          outline: -webkit-focus-ring-color auto 1px;
+        }
+          .bes-replacement-btn:focus-visible{
+          outline: -webkit-focus-ring-color auto 1px;
         }
         .bes-replacement-div{
           margin-top: 4px;