diff --git a/src/components/dialog/edit-widget-aspect-control.js b/src/components/dialog/edit-widget-aspect-control.js
index 1288704..2e4d4d8 100644
--- a/src/components/dialog/edit-widget-aspect-control.js
+++ b/src/components/dialog/edit-widget-aspect-control.js
@@ -23,12 +23,24 @@ import React from 'react';
 import { FormGroup, Checkbox } from 'react-bootstrap';
 
 class EditWidgetAspectControl extends React.Component {
-  render() {
-    console.log(this.props.lockAspect);
+  constructor(props) {
+    super(props);
 
+    this.state = {
+      widget: {
+        lockAspect: true
+      }
+    };
+  }
+
+  componentWillReceiveProps(nextProps) {
+    this.setState({ widget: nextProps.widget });
+  }
+
+  render() {
     return (
       <FormGroup>
-        <Checkbox id="lockAspect" checked={this.props.lockAspect} onChange={e => this.props.handleChange(e)}>Lock Aspect</Checkbox>
+        <Checkbox id="lockAspect" checked={this.state.widget.lockAspect} onChange={e => this.props.handleChange(e)}>Lock Aspect</Checkbox>
       </FormGroup>
     );
   }
diff --git a/src/components/dialog/edit-widget-control-creator.js b/src/components/dialog/edit-widget-control-creator.js
index a5d2072..c6f9f4c 100644
--- a/src/components/dialog/edit-widget-control-creator.js
+++ b/src/components/dialog/edit-widget-control-creator.js
@@ -65,7 +65,7 @@ export default function createControls(widgetType = null, widget = null, session
         case 'Image': {
             dialogControls.push(
                 <EditImageWidgetControl key={1} sessionToken={sessionToken} widget={widget} files={files} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetAspectControl key={2} lockAspect={widget.lockAspect} handleChange={e => handleChange(e)} />);
+                <EditWidgetAspectControl key={2} widget={widget} handleChange={e => handleChange(e)} />);
             }
             break;
         case 'Gauge': {
diff --git a/src/components/dialog/edit-widget.js b/src/components/dialog/edit-widget.js
index 335e264..65a5de9 100644
--- a/src/components/dialog/edit-widget.js
+++ b/src/components/dialog/edit-widget.js
@@ -73,13 +73,15 @@ class EditWidgetDialog extends Component {
         let changeObject = {};
         if (e.target.id === 'simulator') {
           changeObject[e.target.id] = JSON.parse(e.target.value);
+        } else if (e.target.id === 'lockAspect') {
+          changeObject[e.target.id] = e.target.checked;
         } else if (e.target.id === 'file') {
           changeObject[e.target.id] = e.target.value;
 
           // get file and update size
           let file = this.props.files.find(element => element._id === e.target.value);
 
-          // set default size
+          // set default size 
           changeObject.width = file.dimensions.width;
           changeObject.height = file.dimensions.height;
         } else {