diff --git a/src/plugins/Modal.js b/src/plugins/Modal.js
index 006200760..964e19d53 100644
--- a/src/plugins/Modal.js
+++ b/src/plugins/Modal.js
@@ -30,15 +30,6 @@ export default class Modal extends Plugin {
     this.showModal = this.showModal.bind(this)
   }
 
-  update (state) {
-    if (typeof this.el === 'undefined') {
-      return
-    }
-
-    const newEl = this.render(this.core.state)
-    yo.update(this.el, newEl)
-  }
-
   addTarget (callerPlugin, render) {
     const callerPluginId = callerPlugin.constructor.name
     const callerPluginName = callerPlugin.name || callerPluginId
@@ -58,7 +49,6 @@ export default class Modal extends Plugin {
       name: callerPluginName,
       icon: callerPluginIcon,
       type: callerPluginType,
-      // el: el,
       render: render,
       isHidden: true
     }
@@ -143,7 +133,10 @@ export default class Modal extends Plugin {
       })
     })
 
+    // add class to body that sets position fixed
     document.body.classList.add('is-UppyModal-open')
+    // focus on modal inner block
+    document.querySelector('*[tabindex="0"]').focus()
   }
 
   events () {
@@ -183,16 +176,11 @@ export default class Modal extends Plugin {
 
     return yo`<div class="${targetClassName}"
                    aria-hidden="${state.modal.isHidden}"
-                   aria-labelledby="modalTitle"
-                   aria-describedby="modalDescription"
+                   aria-label="Uppy Dialog Window (Press escape to close)"
                    role="dialog">
       <div class="UppyModal-overlay"
-                  tabindex="-1"
                   onclick=${this.hideModal}></div>
-      <div class="UppyModal-inner">
-        <button class="UppyModal-close"
-                title="Close Uppy modal"
-                onclick=${this.hideModal}>×</button>
+        <div class="UppyModal-inner" tabindex="0">
         <ul class="UppyModalTabs" role="tablist">
           ${acquirers.map((target) => {
             return yo`<li class="UppyModalTab">
@@ -225,6 +213,9 @@ export default class Modal extends Plugin {
             return target.render(state)
           })}
         </div>
+        <button class="UppyModal-close"
+                title="Close Uppy modal"
+                onclick=${this.hideModal}>×</button>
       </div>
     </div>`
   }
diff --git a/src/scss/_modal.scss b/src/scss/_modal.scss
index d504ab743..75a0190b9 100644
--- a/src/scss/_modal.scss
+++ b/src/scss/_modal.scss
@@ -36,6 +36,7 @@
   transform: translate(-50%, -50%);
   overflow: hidden;
   z-index: $zIndex-3;
+  outline: none;
 }
 
 .UppyModal-close {
@@ -46,7 +47,6 @@
   border: 0;
   cursor: pointer;
   background-color: transparent;
-  outline: none;
   -webkit-appearance: none;
   font-size: 30px;
   line-height: 15px;