diff --git a/ui/src/index.js b/ui/src/index.js
index 37abcc444..5cd09fbb9 100644
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -57,7 +57,7 @@ browserHistory.listen(() => {
 
 window.addEventListener('keyup', event => {
   const escapeKeyCode = 27
-  if (event.keyCode === escapeKeyCode) {
+  if (event.key === 'Escape' || event.which === escapeKeyCode) {
     dispatch(disablePresentationMode())
   }
 })