diff --git a/src/plugins/Dashboard/FileCard.js b/src/plugins/Dashboard/FileCard.js
index a9bea5e8d..7876d97c6 100644
--- a/src/plugins/Dashboard/FileCard.js
+++ b/src/plugins/Dashboard/FileCard.js
@@ -3,25 +3,30 @@ const getFileTypeIcon = require('./getFileTypeIcon')
 const onload = require('on-load')
 const { checkIcon } = require('./icons')
 
-let file
-const meta = {}
+// let file
+// const meta = {}
 
 module.exports = function fileCard (props) {
-  file = props.fileCardFor ? props.files[props.fileCardFor] : false
+  const file = props.fileCardFor ? props.files[props.fileCardFor] : false
+  const meta = {}
 
-  const handleEnterKey = (ev) => {
-    if (file && event.keyCode === 13) {
+  // const handleEnterKey = (ev) => {
+  //   if (event.keyCode === 13) {
+  //     props.done(meta, file.id)
+  //   }
+  // }
+
+  // if (file) {
+  //   document.body.addEventListener('keyup', handleEnterKey)
+  // } else {
+  //   document.body.removeEventListener('keyup', handleEnterKey)
+  // }
+
+  const tempStoreMetaOrSubmit = (ev) => {
+    if (ev.keyCode === 13) {
       props.done(meta, file.id)
     }
-  }
 
-  if (file) {
-    document.body.addEventListener('keyup', handleEnterKey)
-  } else {
-    document.body.removeEventListener('keyup', handleEnterKey)
-  }
-
-  const tempStoreMeta = (ev) => {
     const value = ev.target.value
     const name = ev.target.dataset.name
     meta[name] = value
@@ -37,7 +42,7 @@ module.exports = function fileCard (props) {
                data-name="${field.id}"
                value="${file.meta[field.id]}"
                placeholder="${field.placeholder || ''}"
-               onkeyup=${tempStoreMeta} /></fieldset>`
+               onkeyup=${tempStoreMetaOrSubmit} /></fieldset>`
     })
   }
 
@@ -62,7 +67,7 @@ module.exports = function fileCard (props) {
             <fieldset class="UppyDashboardFileCard-fieldset">
               <label class="UppyDashboardFileCard-label">Name</label>
               <input class="UppyDashboardFileCard-input" data-name="name" type="text" value="${file.meta.name}"
-                     onkeyup=${tempStoreMeta} />
+                     onkeyup=${tempStoreMetaOrSubmit} />
             </fieldset>
             ${renderMetaFields(file)}
           </div>
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 30c101311..afe8eb09e 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -339,7 +339,6 @@ module.exports = class DashboardUI extends Plugin {
     }
 
     const fileCardDone = (meta, fileID) => {
-      console.log(meta)
       this.core.emit('core:update-meta', meta, fileID)
       this.core.emit('dashboard:file-card')
     }