diff --git a/src/views/app.html b/src/views/app.html
index 09483387e..970f1dfe6 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -995,11 +995,22 @@
         <br/>
 
         <div class="row">
-          <div class="col-md-12">
-            <button class="btn btn-primary pull-right" uib-tooltip="{{ app.appStoreId ? '' : 'Not available for custom apps' }}" ng-disabled="!app.appStoreId" ng-click="updates.check()" ng-hide="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="updates.busyCheck"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyCheck"></i> Check for Updates</button>
-            <button ng-class="config.update.apps[app.id].unstable ? 'btn btn-danger pull-right' : 'btn btn-success pull-right'" ng-click="updates.askUpdate()" ng-show="app.installationState !== 'pending_update' && config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="app.taskId || app.error || app.runState === 'stopped'" tooltip-enable="app.taskId || app.error || app.runState === 'stopped'" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is not running' }}">
-              Update Available
-            </button>
+          <div class="col-md-12" ng-show="!config.update.apps[app.id].manifest.version || config.update.apps[app.id].manifest.version === app.manifest.version">
+            <button class="btn btn-primary pull-right" ng-show="app.appStoreId" ng-click="updates.check()" ng-disabled="updates.busyCheck"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyCheck"></i> Check for Updates</button>
+            <span ng-show="!app.appStoreId" class="text-danger pull-right">Updates are not available for custom apps</span>
+          </div>
+          <div class="col-md-12" ng-show="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version && app.installationState !== 'pending_update'">
+            <button class="btn pull-right btn-success" ng-click="updates.askUpdate()" ng-hide="app.taskId || app.error || app.runState === 'stopped'">Update Available</button>
+
+            <!-- active apptask -->
+            <span class="text-danger pull-right" ng-show="app.taskId">The available update can only be applied after the current active task has finished.</span>
+
+            <!-- app in error state -->
+            <span class="text-danger pull-right" ng-show="app.error">The app cannot be updated if in error state.</span>
+
+            <!-- app not running -->
+            <span class="text-danger" ng-show="app.runState === 'stopped'">App is not running. First start the app, then apply the update.</span>
+            <button class="btn btn-primary pull-right" ng-show="app.runState === 'stopped'" ng-click="console.toggleRunState()">Start App</button>
           </div>
         </div>
         <hr/>