diff --git a/panels/hassio/ha-panel-hassio.html b/panels/hassio/ha-panel-hassio.html
index d1dec0d7cf..7a9747fa51 100644
--- a/panels/hassio/ha-panel-hassio.html
+++ b/panels/hassio/ha-panel-hassio.html
@@ -12,6 +12,7 @@
   </style>
   <template>
     <hassio-data
+      id='data'
       hass='[[hass]]'
       supervisor='{{supervisorInfo}}'
       homeassistant='{{hassInfo}}'
@@ -100,6 +101,11 @@ Polymer({
 
   listeners: {
     'hassio-select-addon': 'addonSelected',
+    'hass-api-called': 'apiCalled',
+  },
+
+  apiCalled: function (ev) {
+    this.$.data.refresh();
   },
 
   computeIsLoaded: function (supervisorInfo, hostInfo, hassInfo, forceLoading) {
diff --git a/panels/hassio/hassio-addon-view.html b/panels/hassio/hassio-addon-view.html
index 06af895fe8..1c7a18b114 100644
--- a/panels/hassio/hassio-addon-view.html
+++ b/panels/hassio/hassio-addon-view.html
@@ -234,6 +234,14 @@ Polymer({
     },
   },
 
+  listeners: {
+    'hass-api-called': 'apiCalled',
+  },
+
+  apiCalled: function (ev) {
+    this.addonChanged(this.addon);
+  },
+
   addonChanged: function (addon) {
     if (!this.hass) {
       setTimeout(function () { this.addonChanged(addon); }.bind(this), 0);
@@ -242,10 +250,9 @@ Polymer({
 
     this.hass.callApi('get', 'hassio/addons/' + addon + '/info')
       .then(function (info) {
-        // Error if addon not installed.
-        if (info.result !== 'error') {
-          this.addonState = info.data;
-        }
+        this.addonState = info.data;
+      }.bind(this), function (info) {
+        this.addonState = null;
       }.bind(this));
     this.refreshLogs();
   },
diff --git a/panels/hassio/hassio-data.html b/panels/hassio/hassio-data.html
index af4b32062a..4e07d35f45 100644
--- a/panels/hassio/hassio-data.html
+++ b/panels/hassio/hassio-data.html
@@ -25,6 +25,10 @@ Polymer({
   },
 
   attached: function () {
+    this.refresh();
+  },
+
+  refresh: function () {
     this.fetchSupervisorInfo();
     this.fetchHostInfo();
     this.fetchHassInfo();
diff --git a/src/components/buttons/ha-call-api-button.html b/src/components/buttons/ha-call-api-button.html
index ef370897ce..0fc31c07b8 100644
--- a/src/components/buttons/ha-call-api-button.html
+++ b/src/components/buttons/ha-call-api-button.html
@@ -49,14 +49,23 @@ Polymer({
   buttonTapped: function () {
     this.progress = true;
     var el = this;
+    var eventData = {
+      method: this.method,
+      path: this.path,
+      data: this.data,
+    };
 
     this.hass.callApi(this.method, this.path, this.data)
       .then(function () {
         el.progress = false;
         el.$.progress.actionSuccess();
+        eventData.success = true;
       }, function () {
         el.progress = false;
         el.$.progress.actionError();
+        eventData.success = false;
+      }).then(function () {
+        el.fire('hass-api-called', eventData);
       });
   }
 });
diff --git a/src/components/buttons/ha-call-service-button.html b/src/components/buttons/ha-call-service-button.html
index b662a683c6..e7aaebe340 100644
--- a/src/components/buttons/ha-call-service-button.html
+++ b/src/components/buttons/ha-call-service-button.html
@@ -42,14 +42,23 @@ Polymer({
   buttonTapped: function () {
     this.progress = true;
     var el = this;
+    var eventData = {
+      domain: this.domain,
+      service: this.service,
+      serviceData: this.serviceData,
+    };
 
     this.hass.callService(this.domain, this.service, this.serviceData)
       .then(function () {
         el.progress = false;
         el.$.progress.actionSuccess();
+        eventData.success = true;
       }, function () {
         el.progress = false;
         el.$.progress.actionError();
+        eventData.success = false;
+      }).then(function () {
+        el.fire('hass-service-called', eventData);
       });
   }
 });