diff --git a/app/components/widget-image.js b/app/components/widget-image.js
index 22a3dc1..e7c062a 100644
--- a/app/components/widget-image.js
+++ b/app/components/widget-image.js
@@ -46,7 +46,7 @@ export default WidgetAbstract.extend({
       this.get('widget').setProperties(properties);
 
       let self = this;
-      
+
       this.get('widget').save().then(function() {
         self.set('isShowingModal', false);
       });
diff --git a/app/components/widget-plot.js b/app/components/widget-plot.js
index 733c0da..106165c 100644
--- a/app/components/widget-plot.js
+++ b/app/components/widget-plot.js
@@ -40,6 +40,8 @@ export default WidgetAbstract.extend({
 
   signals: Ember.A([]),
 
+  checkedSignals: {},
+
   _updateDataObserver: Ember.on('init', Ember.observer('widget.widgetData.simulator', function() {
     // get query for observer
     let simulatorId = this.get('widget.widgetData.simulator');
@@ -90,15 +92,18 @@ export default WidgetAbstract.extend({
 
                     // set signals
                     let mapping = simulationModel.get('mapping');
+                    let checkedSignals = {};
 
                     // uncheck all signals
                     mapping.forEach(function(key) {
-                      self.set(key + 'Checked', false);
+                      checkedSignals[key] = false;
                     });
 
                     self.get('signals').forEach(function(signal) {
-                      self.set(mapping[signal] + 'Checked', true);
+                      checkedSignals[mapping[signal]] = true;
                     });
+
+                    self.set('checkedSignals', checkedSignals);
                   }
                 });
               });
@@ -143,8 +148,10 @@ export default WidgetAbstract.extend({
                     widgetData.signals = [];
 
                     // uncheck all signals
+                    let checkedSignals = self.get('checkedSignals');
+
                     for (var i = 0; i < mapping.length; i++) {
-                      if (self.get(mapping[i] + 'Checked')) {
+                      if (checkedSignals[mapping[i]]) {
                         widgetData.signals.push(i);
                       }
                     }
diff --git a/app/templates/components/widget-plot.hbs b/app/templates/components/widget-plot.hbs
index 3f04c8f..11f0101 100644
--- a/app/templates/components/widget-plot.hbs
+++ b/app/templates/components/widget-plot.hbs
@@ -34,7 +34,7 @@
           </td>
           <td>
             {{#each simulationModel.mapping as |signal|}}
-              <input type='checkbox' name={{signal}} checked={{concat signal "Checked"}} /><label for={{signal}}> {{signal}}</label>
+              {{input type='checkbox' name=signal checked=(mut (get checkedSignals signal))}}<label for={{signal}}> {{signal}}</label>
               <br />
             {{/each}}
           </td>