diff --git a/src/translation/en.json b/src/translation/en.json
index 2bf20c30e..1fac791b4 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1385,6 +1385,9 @@
             "running": "Running",
             "stopped": "Stopped",
             "notResponding": "Not Responding"
+        },
+        "stopDialog": {
+            "title": "Really stop app {{ app }}?"
         }
     },
     "login": {
diff --git a/src/views/app.html b/src/views/app.html
index 4724cb8df..28ef588e2 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -41,6 +41,21 @@
   </div>
 </div>
 
+<!-- Modal stop app -->
+<div class="modal fade" id="stopModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'app.stopDialog.title' | tr:{ app: (app.label || app.fqdn) } }}</h4>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="uninstall.toggleRunState()" ng-disabled="uninstall.busyRunState"><i class="fa fa-circle-notch fa-spin" ng-show="uninstall.busyRunState"></i> {{ 'app.uninstall.startStop.stopAction' | tr }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal domain collision -->
 <div class="modal fade" id="domainCollisionsModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -397,7 +412,7 @@
           <a ng-href="{{ app | applicationLink }}" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) }" ng-click="(app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && postInstallMessage.show(true)">{{ app.label || app.fqdn }} <sup ng-show="app | appIsInstalledAndHealthy"><i class="fas fa-external-link-alt" style="font-size: 12px;"></i></sup></a>
         </h1>
         <div>
-          <button class="btn btn-sm btn-default" ng-class="{ 'btn-primary': uninstall.startButton }" ng-click="uninstall.toggleRunState()" ng-disabled="app.taskId || app.error || app.installationState === 'pending_start' || app.installationState === 'pending_stop'" uib-tooltip="{{ uninstall.startButton ? ('app.uninstall.startStop.startAction' | tr) : ('app.uninstall.startStop.stopAction' | tr) }}" tooltip-append-to-body="true" tooltip-placement="bottom">
+          <button class="btn btn-sm btn-default" ng-class="{ 'btn-primary': uninstall.startButton }" ng-click="uninstall.toggleRunState(true)" ng-disabled="app.taskId || app.error || app.installationState === 'pending_start' || app.installationState === 'pending_stop'" uib-tooltip="{{ uninstall.startButton ? ('app.uninstall.startStop.startAction' | tr) : ('app.uninstall.startStop.stopAction' | tr) }}" tooltip-append-to-body="true" tooltip-placement="bottom">
             <i ng-show="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fa fa-circle-notch fa-spin"></i>
             <i ng-hide="app.installationState === 'pending_start' || app.installationState === 'pending_stop'" class="fas" ng-class="{ 'fa-power-off': !uninstall.startButton, 'fa-play': uninstall.startButton }"></i>
           </button>
diff --git a/src/views/app.js b/src/views/app.js
index 798285367..2aff97392 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1143,7 +1143,14 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         busyRunState: false,
         startButton: false,
 
-        toggleRunState: function () {
+        toggleRunState: function (confirmStop) {
+            if (confirmStop && $scope.app.runState !== RSTATES.STOPPED) {
+                $('#stopModal').modal('show');
+                return;
+            }
+
+            $('#stopModal').modal('hide');
+
             var func  = $scope.app.runState === RSTATES.STOPPED ? Client.startApp : Client.stopApp;
             $scope.uninstall.busyRunState = true;