diff --git a/popup.html b/popup.html
index 2052905..63596a5 100644
--- a/popup.html
+++ b/popup.html
@@ -4,8 +4,8 @@
     <link rel="stylesheet" href="popup.css" />
   </head>
   <body>
-    <div class="link save">Save tabs to file</div>
-    <div class="link restore">Restore tabs from file</div>
+    <div class="link save"><u>S</u>ave tabs to file</div>
+    <div class="link restore"><u>R</u>estore tabs from file</div>
     <script src="popup.js"></script>
   </body>
 </html>
diff --git a/popup.js b/popup.js
index 76595ef..5ccd403 100755
--- a/popup.js
+++ b/popup.js
@@ -3,9 +3,22 @@ chrome.windows.getCurrent((_window) => {
   currentWindow = _window;
 });
 
+let saveButton = document.querySelector("div.link.save");
+let restoreButton = document.querySelector("div.link.restore");
+
 window.addEventListener("keydown", (event) => {
-  if (event.keyCode == 27) {
-    window.close();
+  switch (event.key) {
+    case "s":
+    case "S":
+      saveButton.click();
+      break;
+    case "r":
+    case "R":
+      restoreButton.click();
+      break;
+    case "Escape":
+      window.close();
+      break;
   }
 });
 
@@ -59,5 +72,5 @@ async function restore(event) {
   window.close();
 }
 
-document.querySelector("div.link.save").addEventListener("click", save);
-document.querySelector("div.link.restore").addEventListener("click", restore);
+saveButton.addEventListener("click", save);
+restoreButton.addEventListener("click", restore);
