diff --git a/src/js/index.js b/src/js/index.js
index 6a5c8bcd5..3407e5cbc 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -348,63 +348,6 @@ app.filter('installationStateLabel', function () {
     };
 });
 
-// this appears when task is getting canceled
-app.filter('installationStateCancelTask', function() {
-    return function(app) {
-        switch (app.installationState) {
-        case ISTATES.PENDING_INSTALL: return 'installing';
-        case ISTATES.PENDING_CLONE: return 'cloning';
-
-        case ISTATES.PENDING_CONFIGURE:
-        case ISTATES.PENDING_LOCATION_CHANGE:
-        case ISTATES.PENDING_RECREATE_CONTAINER:
-        case ISTATES.PENDING_DEBUG:
-        case ISTATES.PENDING_RESIZE:
-
-            return 'configuring';
-
-        case ISTATES.PENDING_DATA_DIR_MIGRATION: return 'migrating';
-        case ISTATES.PENDING_UNINSTALL: return 'uninstalling';
-        case ISTATES.PENDING_RESTORE: return 'restoring';
-        case ISTATES.PENDING_UPDATE: return 'updating';
-        case ISTATES.PENDING_BACKUP: return 'backing up';
-        case ISTATES.INSTALLED: {
-            if (app.runState === 'pending_start') return 'starting';
-            else if (app.runState === 'pending_stop') return 'stopping';
-        }
-        }
-
-        return app.installationState;
-    };
-});
-
-app.filter('installationStateCancelTooltip', function() {
-    return function(app) {
-        switch (app.installationState) {
-        case ISTATES.PENDING_INSTALL: return 'install';
-        case ISTATES.PENDING_CLONE: return 'clone';
-        case ISTATES.PENDING_CONFIGURE:
-        case ISTATES.PENDING_LOCATION_CHANGE:
-        case ISTATES.PENDING_RECREATE_CONTAINER:
-        case ISTATES.PENDING_DEBUG:
-        case ISTATES.PENDING_RESIZE:
-            return 'configure';
-
-        case ISTATES.PENDING_DATA_DIR_MIGRATION: return 'migrate';
-        case ISTATES.PENDING_UNINSTALL: return 'uninstall';
-        case ISTATES.PENDING_RESTORE: return 'restore';
-        case ISTATES.PENDING_UPDATE: return 'update';
-        case ISTATES.PENDING_BACKUP: return 'backup';
-        case ISTATES.INSTALLED: {
-            if (app.runState === 'pending_start') return 'start';
-            else if (app.runState === 'pending_stop') return 'stop';
-        }
-        }
-
-        return app.installationState;
-    };
-});
-
 app.filter('readyToUpdate', function () {
     return function (apps) {
         return apps.every(function (app) {
diff --git a/src/views/apps.html b/src/views/apps.html
index c900ac8b4..3754a545d 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -209,27 +209,6 @@
     </div>
 </div>
 
-<!-- Modal cancel app -->
-<div class="modal fade" id="appCancelModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">Cancel {{ appCancel.app.fqdn }}</h4>
-            </div>
-            <div class="modal-body">
-              The app at {{ appCancel.app.fqdn }} is <b>{{ appCancel.app | installationStateCancelTask }}</b>. Do you want to cancel this operation?
-              <br/>
-              <br/>
-              You can Restore or Repair the app to get it running again.
-            </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="appCancel.submit()" ng-disabled="appCancel.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appCancel.busy"></i> Stop {{ appCancel.app | installationStateCancelTooltip }}</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <!-- Modal update app -->
 <div class="modal fade" id="appUpdateModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -320,7 +299,6 @@
               </div>
 
               <div class="grid-item-actions" ng-show="user.admin">
-                <a href="" ng-show="app | activeTask" ng-click="appCancel.show(app)" uib-tooltip="Cancel {{app | installationStateCancelTooltip}}" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-ban scale"></i></a>
                 <a href="" ng-hide="!backupsEnabled || (app | activeTask)" ng-click="appRestore.show(app)" uib-tooltip="Backups" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-archive scale"></i></a>
                 <a ng-href="#/app/{{ app.id}}" uib-tooltip="Configure" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-wrench scale"></i></a>
                 <a href="" ng-click="showInformation(app)" uib-tooltip="Information" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-info-circle scale"></i></a>
diff --git a/src/views/apps.js b/src/views/apps.js
index 7eb829c64..2da163c4e 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -179,36 +179,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         }
     };
 
-    $scope.appCancel = {
-        app: {},
-        busy: false,
-
-        show: function (app) {
-            $scope.appCancel.app = app;
-            $scope.appCancel.busy = false;
-
-            $('#appCancelModal').modal('show');
-        },
-
-        submit: function () {
-            $scope.appCancel.busy = true;
-
-            Client.stopTask($scope.appCancel.app.taskId, function (error) {
-                if (error) Client.error(error);
-
-                setTimeout(function () { // small delay for UI
-                    $scope.appCancel.busy = false;
-
-                    Client.refreshAppCache($scope.appCancel.app.id); // reflect the new app state immediately
-
-                    $('#appCancelModal').modal('hide');
-                }, 1000);
-            });
-
-            return false; // prevent propagation and default
-        }
-    };
-
     $scope.appInfo = {
         app: {},
         message: ''
@@ -339,10 +309,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         return user.username ? user.username : user.email;
     };
 
-    $scope.cancel = function () {
-        window.history.back();
-    };
-
     function fetchUsers() {
         Client.getUsers(function (error, users) {
             if (error) {