diff --git a/src/app/ui/modaldialog.js b/src/app/ui/modaldialog.js
index 17a2d96b24..77a69bb2d3 100644
--- a/src/app/ui/modaldialog.js
+++ b/src/app/ui/modaldialog.js
@@ -2,6 +2,7 @@ var yo = require('yo-yo')
 var css = require('./styles/modaldialog-styles')
 
 module.exports = (title, content, ok, cancel, focusSelector, opts) => {
+  let agreed = true
   opts = opts || {}
   var container = document.querySelector(`.${css.modal}`)
   if (!container) {
@@ -31,10 +32,28 @@ module.exports = (title, content, ok, cancel, focusSelector, opts) => {
 
   show()
 
+  function setFocusOn (btn) {
+    var okDiv = document.getElementById('modal-footer-ok')
+    var cancelDiv = document.getElementById('modal-footer-cancel')
+    if (btn === 'ok') {
+      agreed = true
+      okDiv.style.backgroundColor = 'var(--dark)'
+      okDiv.style.color = 'var(--light)'
+      cancelDiv.style.backgroundColor = 'var(--light)'
+      cancelDiv.style.color = 'var(--dark)'
+    } else {
+      agreed = false
+      okDiv.style.backgroundColor = 'var(--light)'
+      okDiv.style.color = 'var(--dark)'
+      cancelDiv.style.backgroundColor = 'var(--dark)'
+      cancelDiv.style.color = 'var(--light)'
+    }
+  }
+
   function okListener () {
     removeEventListener()
     hide()
-    if (ok && ok.fn) ok.fn()
+    if (ok && ok.fn && agreed) ok.fn()
   }
 
   function cancelListener () {
@@ -53,6 +72,12 @@ module.exports = (title, content, ok, cancel, focusSelector, opts) => {
     } else if (e.keyCode === 13) {
       e.preventDefault()
       okListener()
+    } else if (e.keyCode === 37) {
+      e.preventDefault()
+      setFocusOn('ok')
+    } else if (e.keyCode === 39) {
+      e.preventDefault()
+      setFocusOn('cancel')
     }
   }
 
@@ -96,16 +121,17 @@ module.exports = (title, content, ok, cancel, focusSelector, opts) => {
 function html (opts) {
   return yo`<div id="modal-dialog" class="${css.modal}">
   <div id="modal-background" class="${css['modalBackground']}"> </div>
-  <div class="${css['modalContent']} bg-light text-secondary ${opts.class}">
-    <div class="${css['modalHeader']}">
-    <h3></h3>
-    <i id="modal-close" title="Close" class="fa fa-times ${css['modalClose']}" aria-hidden="true"></i>
-  </div>
-  <div class="${css['modalBody']}"> -
-  </div>
-  <div class="${css['modalFooter']}">
-    <span id="modal-footer-ok" class="${css['modalFooterOk']} btn btn-sm btn-primary">OK</span><span id="modal-footer-cancel"  class="${css['modalFooterCancel']} btn btn-sm btn-primary">Cancel</span>
-        </div>
-  </div>
+    <div class="${css['modalContent']} bg-light text-secondary ${opts.class}">
+      <div class="${css['modalHeader']}">
+        <h3></h3>
+        <i id="modal-close" title="Close" class="fa fa-times ${css['modalClose']}" aria-hidden="true"></i>
+      </div>
+      <div class="${css['modalBody']}"> -
+      </div>
+      <div class="${css['modalFooter']}">
+        <span id="modal-footer-ok" class="${css['modalFooterOk']} btn btn-sm btn-dark autofocus tabindex='1'">OK</span>
+        <span id="modal-footer-cancel" class="${css['modalFooterCancel']} btn btn-sm btn-light tabindex='0'">Cancel</span>
+      </div>
+    </div>
   </div>`
 }
diff --git a/src/app/ui/styles/modaldialog-styles.js b/src/app/ui/styles/modaldialog-styles.js
index 00b750ec22..25370df7dc 100644
--- a/src/app/ui/styles/modaldialog-styles.js
+++ b/src/app/ui/styles/modaldialog-styles.js
@@ -56,9 +56,24 @@ var css = csjs`
     animation-duration: 0.4s
   }
   .modalFooterOk {
+    background-color: var(--light);
+    color: var(--dark);
+    cursor: pointer;
+  }
+  .modalFooterOk:hover {
+    background-color: var(--dark);
+    color: var(--light);
     cursor: pointer;
   }
   .modalFooterCancel {
+    background-color: var(--light);
+    color: var(--dark);
+    margin-left: 1em;
+    cursor: pointer;
+  }
+  .modalFooterCancel:hover {
+    background-color: var(--dark);
+    color: var(--light);
     margin-left: 1em;
     cursor: pointer;
   }