diff --git a/src/views/app.html b/src/views/app.html
index 3437d5aa1..f73c76215 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -47,6 +47,25 @@
   </div>
 </div>
 
+<!-- Modal update app -->
+<div class="modal fade" id="updateModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Update {{ app.fqdn }}</h4>
+      </div>
+      <div class="modal-body">
+        <p>Recent Changes for new version <b>{{ config.update.apps[app.id].manifest.version}}</b>:</p>
+        <div ng-bind-html="config.update.apps[app.id].manifest.changelog | markdown2html"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-success" ng-click="updates.confirmUpdate()" ng-disabled="updates.busyUpdate"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyUpdate"></i> Update</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal clone app -->
 <div class="modal fade" id="cloneModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -467,7 +486,8 @@
         <div class="row">
           <div class="col-md-12">
             <button class="btn btn-danger" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busy"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busy"></i> {{ updates.enableAutomaticUpdate ? 'Disable' : 'Enable' }} Automatic Updates</button>
-            <button class="btn btn-primary pull-right" 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>
+            <button class="btn btn-primary pull-right" 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 class="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">Update Available</button>
           </div>
         </div>
       </div>
@@ -504,7 +524,6 @@
                 </tr>
               </tbody>
             </table>
-            <br/>
           </div>
         </div>
         <hr/>
diff --git a/src/views/app.js b/src/views/app.js
index 4d97b5b9c..e5c4856bd 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -407,6 +407,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     $scope.updates = {
         busy: false,
         busyCheck: false,
+        busyUpdate: false,
 
         enableAutomaticUpdate: false,
 
@@ -437,6 +438,23 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
                 $scope.updates.busyCheck = false;
             });
+        },
+
+        askUpdate: function () {
+            $scope.updates.busyUpdate = false;
+            $('#updateModal').modal('show');
+        },
+
+        confirmUpdate: function () {
+            $scope.updates.busyUpdate = true;
+
+            Client.updateApp($scope.app.id, $scope.config.update.apps[$scope.app.id].manifest, function (error) {
+                $scope.updates.busyUpdate = false;
+                if (error) return Client.error(error);
+
+                $('#updateModal').modal('hide');
+                trackAppTask();
+            });
         }
     };