diff --git a/src/js/index.js b/src/js/index.js
index 3407e5cbc..d4fdb19db 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -328,8 +328,8 @@ app.filter('installationStateLabel', function () {
         case ISTATES.PENDING_UPDATE: return 'Updating' + waiting;
         case ISTATES.PENDING_BACKUP: return 'Backing up' + waiting;
         case ISTATES.ERROR: {
-            if (app.error && app.error.message === 'ETRYAGAIN') return 'DNS Error' + (user.admin ? ' - Click to Repair' : '');
-            return 'Error' + (user.admin ? ' - Click to Repair' : '');
+            if (app.error && app.error.message === 'ETRYAGAIN') return 'DNS Error';
+            return 'Error';
         }
         case ISTATES.INSTALLED: {
             if (app.debugMode) {
diff --git a/src/views/apps.html b/src/views/apps.html
index 9df5c0763..084f7b487 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -30,25 +30,6 @@
   </div>
 </div>
 
-<!-- Modal error app -->
-<div class="modal fade" id="appErrorModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Error for {{ appError.app.fqdn }}</h4>
-            </div>
-            <div class="modal-body">
-                <p>{{ appError.app | prettyAppErrorMessage }}</p>
-            </div>
-            <div class="modal-footer">
-                <a type="button" class="btn btn-primary pull-left" ng-href="{{ '/#/app/' + appError.app.id }}" autofocus>Repair</a>
-                <a type="button" class="btn btn-default pull-left" ng-href="{{ '/logs.html?appId=' + appError.app.id }}" target="_blank">Logs</a>
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <!-- Modal update app -->
 <div class="modal fade" id="appUpdateModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -113,7 +94,7 @@
     <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 && appError.show(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 && showAppDebug(app)) || ((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">
diff --git a/src/views/apps.js b/src/views/apps.js
index 3f9a97f11..87fa43681 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -3,7 +3,7 @@
 /* global angular:false */
 /* global $:false */
 
-angular.module('Application').controller('AppsController', ['$scope', '$timeout', '$interval', 'Client', function ($scope, $timeout, $interval, Client) {
+angular.module('Application').controller('AppsController', ['$scope', '$timeout', '$interval', '$location', 'Client', function ($scope, $timeout, $interval, $location, Client) {
     var ALL_DOMAINS_DOMAIN = { _alldomains: true, domain: 'All Domains' }; // dummy record for the single select filter
 
     $scope.installedApps = Client.getInstalledApps();
@@ -41,18 +41,8 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
         }
     };
 
-    $scope.appError = {
-        app: null,
-
-        show: function (app) {
-            $scope.reset();
-
-            $scope.appError.app = app;
-
-            $('#appErrorModal').modal('show');
-
-            return false; // prevent propagation and default
-        }
+    $scope.showAppDebug = function (app) {
+        $location.path('/app/' + app.id);
     };
 
     $scope.appUpdate = {
@@ -91,7 +81,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
 
     $scope.reset = function () {
         // close all dialogs
-        $('#appErrorModal').modal('hide');
         $('#appUpdateModal').modal('hide');
         $('#appPostInstallConfirmModal').modal('hide');
 
@@ -131,7 +120,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
     });
 
     // setup all the dialog focus handling
-    ['appUpdateModal', 'appErrorModal'].forEach(function (id) {
+    ['appUpdateModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });