diff --git a/src/views/app.html b/src/views/app.html
index 5c7398e5c..2bec73fb6 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -501,7 +501,7 @@
           <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-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>
+            <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 || !(app | installSuccess)">Update Available</button>
           </div>
         </div>
       </div>
diff --git a/src/views/apps.html b/src/views/apps.html
index 084f7b487..050508944 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -30,25 +30,6 @@
   </div>
 </div>
 
-<!-- Modal update app -->
-<div class="modal fade" id="appUpdateModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Update {{ appUpdate.app.fqdn }}</h4>
-            </div>
-            <div class="modal-body">
-                <p>Recent Changes for new version <b>{{ appUpdate.manifest.version}}</b>:</p>
-                <div ng-bind-html="appUpdate.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-danger" ng-click="appUpdate.submit()" ng-disabled="appUpdate.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appUpdate.busy"></i> Update</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <script>
     function imageErrorHandler(elem) {
         'use strict';
@@ -94,13 +75,13 @@
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
       <div class="app-grid">
         <div class="grid-item" ng-repeat="app in installedApps | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | orderBy:'location'">
-          <a ng-href="{{ app | applicationLink }}" ng-click="user.admin && ((app | installError) === true && showAppDebug(app)) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) }">
+          <a ng-href="{{ app | applicationLink }}" ng-click="user.admin && ((app | installError) === true && showAppConfigure(app, 'debug')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) }">
             <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
               <div class="grid-item-top">
                 <div class="row">
                   <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">
-                  <br/>
-                  <img ng-src="{{ app.iconUrl || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)" class="app-icon"/>
+                    <br/>
+                    <img ng-src="{{ app.iconUrl || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)" class="app-icon"/>
                   </div>
                 </div>
                 <br/>
@@ -124,7 +105,7 @@
               </div>
 
               <!-- we check the version here because the box updater does not know when an app gets updated -->
-              <div class="app-update-badge" ng-click="appUpdate.show(app, config.update.apps[app.id].manifest)" ng-show="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version && (app | installSuccess)">
+              <div class="app-update-badge" ng-click="showAppConfigure(app, 'updates')" ng-show="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version && (app | installSuccess)">
                 <i class="fa fa-arrow-up fa-inverse"></i>
               </div>
             </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 214cc7dc0..2174ef120 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -21,10 +21,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
         confirmed: false,
 
         show: function (app) {
-            $scope.reset();
-
             $scope.appPostInstallConfirm.app = app;
             $scope.appPostInstallConfirm.message = app.manifest.postInstallMessage;
+            $scope.appPostInstallConfirm.confirmed = false;
 
             $('#appPostInstallConfirmModal').modal('show');
 
@@ -41,61 +40,17 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
         }
     };
 
-    $scope.showAppDebug = function (app) {
-        $location.path('/app/' + app.id + '/debug');
+    $scope.showAppConfigure = function (app, view) {
+        $location.path('/app/' + app.id + '/' + view);
     };
 
-    $scope.appUpdate = {
-        busy: false,
-        error: {},
-        app: {},
-        manifest: {},
-        portBindings: {},
+    Client.onReady(function () {
+        Client.refreshInstalledApps(); // refresh the new list immediately when switching from another view (appstore)
 
-        show: function (app, updateManifest) {
-            $scope.reset();
+        var refreshAppsTimer = $interval(Client.refreshInstalledApps.bind(Client), 5000);
 
-            $scope.appUpdate.app = app;
-            $scope.appUpdate.manifest = angular.copy(updateManifest);
+        if (!$scope.user.admin) return;
 
-            $('#appUpdateModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.appUpdate.busy = true;
-
-            Client.updateApp($scope.appUpdate.app.id, $scope.appUpdate.manifest, function (error) {
-                if (error) {
-                    Client.error(error);
-                } else {
-                    $scope.appUpdate.app = {};
-                    $('#appUpdateModal').modal('hide');
-                }
-
-                $scope.appUpdate.busy = false;
-
-                Client.refreshAppCache($scope.appUpdate.app.id); // reflect the new app state immediately
-            });
-        }
-    };
-
-    $scope.reset = function () {
-        // close all dialogs
-        $('#appUpdateModal').modal('hide');
-        $('#appPostInstallConfirmModal').modal('hide');
-
-        // reset update dialog
-        $scope.appUpdate.error = {};
-        $scope.appUpdate.app = {};
-        $scope.appUpdate.manifest = {};
-
-        // post install confirmation dialog
-        $scope.appPostInstallConfirm.app = {};
-        $scope.appPostInstallConfirm.message = '';
-        $scope.appPostInstallConfirm.confirmed = false;
-    };
-
-    function getDomains() {
         Client.getDomains(function (error, result) {
             if (error) {
                 console.error(error);
@@ -105,25 +60,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
             $scope.domains = result;
             $scope.filterDomains = [ALL_DOMAINS_DOMAIN].concat(result);
         });
-    }
-
-    Client.onReady(function () {
-        Client.refreshInstalledApps(); // refresh the new list immediately when switching from another view (appstore)
-
-        if ($scope.user.admin) getDomains();
-
-        var refreshAppsTimer = $interval(Client.refreshInstalledApps.bind(Client), 5000);
-
-        $scope.$on('$destroy', function () {
-            $interval.cancel(refreshAppsTimer);
-        });
-    });
-
-    // setup all the dialog focus handling
-    ['appUpdateModal'].forEach(function (id) {
-        $('#' + id).on('shown.bs.modal', function () {
-            $(this).find("[autofocus]:first").focus();
-        });
     });
 
     $('.modal-backdrop').remove();