diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js
index 073c5fe..10db62c 100644
--- a/src/dashboard/dashboard.js
+++ b/src/dashboard/dashboard.js
@@ -280,6 +280,11 @@ class Dashboard extends Component {
   }
 
   closeEditFiles(){
+    this.state.widgets.map(widget => {
+      if(widget.type === "Image"){
+        widget.customProperties.update = true;
+      }     
+    })
     this.setState({ filesEditModal: false });
   }
 
diff --git a/src/widget/edit-widget/edit-widget-file-control.js b/src/widget/edit-widget/edit-widget-file-control.js
index 21868ce..b55afe5 100644
--- a/src/widget/edit-widget/edit-widget-file-control.js
+++ b/src/widget/edit-widget/edit-widget-file-control.js
@@ -55,7 +55,7 @@ class EditFileWidgetControl extends React.Component {
         <option key={index+1} value={file.id}>{file.name}</option>
       )))
     } else {
-      fileOptions = <option disabled value style={{ display: 'none' }}>No files found, please upload one first.</option>
+      fileOptions = <option style={{ display: 'none' }}>No files found.</option>
     }
 
     return <div>
diff --git a/src/widget/edit-widget/edit-widget.js b/src/widget/edit-widget/edit-widget.js
index 03b6931..ef6e09b 100644
--- a/src/widget/edit-widget/edit-widget.js
+++ b/src/widget/edit-widget/edit-widget.js
@@ -50,13 +50,21 @@ class EditWidgetDialog extends React.Component {
     fileId = parseInt(fileId, 10)
     // get aspect ratio of file
     const file = this.props.files.find(element => element.id === fileId);
-
     // scale width to match aspect
-    if(file.dimensions){
-    const aspectRatio = file.dimensions.width / file.dimensions.height;
-    changeObject.width = this.state.temporal.height * aspectRatio;
-    }
+    if (file) {
+      let img = new Image();
 
+      img.src = file.objectURL;
+
+
+      img.onload = function () {
+        let height = img.height;
+        let width = img.width;
+
+        const aspectRatio = width / height;
+        changeObject.width = Math.round(changeObject.height * aspectRatio);
+      }
+    }
     return changeObject;
   }
 
@@ -106,6 +114,7 @@ class EditWidgetDialog extends React.Component {
     }
 
     if (parts[1] === 'lockAspect') {
+      console.log("pats[1} === lockaspect");
       //not a customProperty
       customProperty ? changeObject[parts[0]][parts[1]] = e.target.checked : changeObject[e.target.id] = e.target.checked;
 
@@ -122,11 +131,11 @@ class EditWidgetDialog extends React.Component {
       }
 
       // get file and update size (if it's an image)
-      /*if ((changeObject.customProperties.file !== -1)&&('lockAspect' in this.state.temporal && this.state.temporal.lockAspect)) {
+      if ((changeObject.customProperties.file !== -1)&&(this.props.widget.customProperties.lockAspect)) {
         // TODO this if condition requires changes to work!!!
         changeObject = this.assignAspectRatio(changeObject, e.target.value);
-      }*/
-    } else if (parts[1] === 'textSize'){
+
+    }} else if (parts[1] === 'textSize'){
       changeObject[parts[0]][parts[1]] = Number(e.target.value);
       changeObject = this.setMaxWidth(changeObject);
 
diff --git a/src/widget/widgets/image.js b/src/widget/widgets/image.js
index f289324..21f11ec 100644
--- a/src/widget/widgets/image.js
+++ b/src/widget/widgets/image.js
@@ -60,6 +60,9 @@ class WidgetImage extends React.Component {
         });
         this.setState({ file: file })
       }
+      else if (this.state.file === undefined || (this.state.file.id !== file.id) ){
+        this.setState({ file: file})
+      }
     }
 
   }