diff --git a/packages/@uppy/dashboard/src/components/FileCard/index.js b/packages/@uppy/dashboard/src/components/FileCard/index.js
index 83264bbf05..c1628c5b01 100644
--- a/packages/@uppy/dashboard/src/components/FileCard/index.js
+++ b/packages/@uppy/dashboard/src/components/FileCard/index.js
@@ -152,7 +152,14 @@ class FileCard extends Component {
               <button
                 type="button"
                 className="uppy-u-reset uppy-c-btn uppy-Dashboard-FileCard-edit"
-                onClick={() => this.props.openFileEditor(file)}
+                onClick={(event) => {
+                  // When opening the image editor we want to save any meta fields changes.
+                  // Otherwise it's confusing for the user to click save in the editor,
+                  // but the changes here are discarded. This bypasses validation,
+                  // but we are okay with that.
+                  this.handleSave(event)
+                  this.props.openFileEditor(file)
+                }}
                 form={this.form.id}
               >
                 {this.props.i18n('editFile')}