diff --git a/src/app/ui/modaldialog.js b/src/app/ui/modaldialog.js
index d36944cb0f..6cee053951 100644
--- a/src/app/ui/modaldialog.js
+++ b/src/app/ui/modaldialog.js
@@ -40,13 +40,11 @@ module.exports = (title, content, ok, cancel) => {
   }
 
   function modalKeyEvent (e) {
-    e.preventDefault()
     if (e.keyCode === 27) {
       cancelListener()
     } else if (e.keyCode === 13) {
+      e.preventDefault()
       okListener()
-    } else {
-      // Do nothing
     }
   }
 
@@ -74,6 +72,7 @@ module.exports = (title, content, ok, cancel) => {
 
 function html () {
   return yo`<div id="modal-dialog" class="${css.modal}">
+  <div id="modal-background" class="${css['modalBackground']}"> </div>
   <div class="${css['modalContent']}">
     <div class="${css['modalHeader']}">
     <h2></h2>
@@ -85,6 +84,5 @@ function html () {
     <span id="modal-footer-ok" class=${css['modalFooterOk']}>OK</span><span id="modal-footer-cancel"  class=${css['modalFooterCancel']}>Cancel</span>
         </div>
   </div>
-  <div id="modal-background" class="${css['modalBackground']}"> </div>
   </div>`
 }
diff --git a/src/app/ui/styles/modaldialog-styles.js b/src/app/ui/styles/modaldialog-styles.js
index b1a8913c60..d7844a272e 100644
--- a/src/app/ui/styles/modaldialog-styles.js
+++ b/src/app/ui/styles/modaldialog-styles.js
@@ -73,6 +73,12 @@ var css = csjs`
     color: ${styles.remix.modalDialog_Header_Footer_Color};
     cursor: pointer;
   }
+  .modalBackground {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top:0;
+  }
   @-webkit-keyframes animatetop {
     from {top: -300px; opacity: 0}
     to {top: 0; opacity: 1}