diff --git a/src/js/client.js b/src/js/client.js
index 4a9fe703a..c30381fcf 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1056,6 +1056,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
             app.message = installationProgress.replace(/.*, /,'');
         }
 
+        // amend the post install confirm state
+        app.pendingPostInstallConfirmation = !!localStorage['confirmPostInstall_' + app.id];
+
         return app;
     };
 
diff --git a/src/js/index.js b/src/js/index.js
index d9febc20e..b5a8442dd 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -236,7 +236,7 @@ app.filter('ignoreAdminGroup', function () {
 
 app.filter('applicationLink', function() {
     return function(app) {
-        if (app.installationState === ISTATES.INSTALLED && app.health === HSTATES.HEALTHY) {
+        if (app.installationState === ISTATES.INSTALLED && app.health === HSTATES.HEALTHY && !app.pendingPostInstallConfirmation) {
             return 'https://' + app.fqdn;
         } else {
             return '';
diff --git a/src/views/apps.html b/src/views/apps.html
index 44ebc8a66..61934cc7c 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -311,6 +311,35 @@
     </div>
 </div>
 
+<!-- Modal postinstall confirm -->
+<div class="modal fade" id="appPostInstallConfirmModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <img ng-src="{{appPostInstallConfirm.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-info-icon"/>
+        <h5 class="app-info-title">
+          {{ appPostInstallConfirm.app.manifest.title }}
+          <span class="app-info-meta text-small">Package <a ng-href="/#/appstore/{{appPostInstallConfirm.app.manifest.id}}?version={{appPostInstallConfirm.app.manifest.version}}">v{{ appPostInstallConfirm.app.manifest.version }}</a> </span>
+        </h5>
+        <br/>
+        <span class="app-info-meta" ng-show="appPostInstallConfirm.app.manifest.documentationUrl"><a target="_blank" ng-href="{{appPostInstallConfirm.app.manifest.documentationUrl}}">Documentation</a> </span>
+        <br/>
+      </div>
+      <div class="modal-body">
+        <div ng-bind-html="appPostInstallConfirm.app.manifest.postInstallMessage | postInstallMessage:appPostInstallConfirm.app | markdown2html"></div>
+      </div>
+      <div class="modal-footer">
+          <div class="form-group pull-left">
+            <input type="checkbox" id="appPostInstallConfirmCheckbox" ng-model="appPostInstallConfirm.confirmed">
+            <label class="control-label" for="appPostInstallConfirmCheckbox">Confirm to have read the instructions</label>
+          </div>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <a class="btn btn-success" ng-href="{{ appPostInstallConfirm.confirmed ? ('https://' + appPostInstallConfirm.app.fqdn) : '' }}" target="_blank" ng-disabled="!appPostInstallConfirm.confirmed" ng-click="appPostInstallConfirm.submit()">Open {{ appPostInstallConfirm.app.manifest.title }}</a>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal error app -->
 <div class="modal fade" id="appErrorModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -428,7 +457,7 @@
     <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
         <div class="col-sm-1 grid-item" ng-repeat="app in installedApps | orderBy:'location'">
             <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
-                <a ng-href="{{ app | applicationLink }}" ng-click="(app | installError) === true && showError(app)" target="_blank" ng-class="{ 'hand': !(app | installationActive) }">
+                <a ng-href="{{ app | applicationLink }}" ng-click="((app | installError) === true && showError(app)) || (app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': !(app | installationActive) }">
                     <div class="grid-item-top">
                         <div class="row">
                             <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">
diff --git a/src/views/apps.js b/src/views/apps.js
index 0017796f9..d7fc1dee0 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -313,6 +313,30 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         message: ''
     };
 
+    $scope.appPostInstallConfirm = {
+        app: {},
+        message: '',
+        confirmed: false,
+
+        show: function (app) {
+            $scope.reset();
+
+            $scope.appPostInstallConfirm.app = app;
+            $scope.appPostInstallConfirm.message = app.manifest.postInstallMessage;
+
+            $('#appPostInstallConfirmModal').modal('show');
+
+            return false; // prevent propagation and default
+        },
+
+        submit: function () {
+            $scope.appPostInstallConfirm.app.pendingPostInstallConfirmation = false;
+            delete localStorage['confirmPostInstall_' + $scope.appPostInstallConfirm.app.id];
+
+            $('#appPostInstallConfirmModal').modal('hide');
+        }
+    };
+
     $scope.appError = {
         app: {}
     };
@@ -333,6 +357,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $('#appUpdateModal').modal('hide');
         $('#appInfoModal').modal('hide');
         $('#appUninstallModal').modal('hide');
+        $('#appPostInstallConfirmModal').modal('hide');
 
         // reset configure dialog
         $scope.appConfigure.error = {};
@@ -383,6 +408,11 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appRestore.portBindingsInfo = {};
         $scope.appRestore.portBindingsEnabled = {};
         $scope.appRestore.action = 'restore';
+
+        // post install confirmation dialog
+        $scope.appPostInstallConfirm.app = {};
+        $scope.appPostInstallConfirm.message = '';
+        $scope.appPostInstallConfirm.confirmed = false;
     };
 
     $scope.readCertificate = function (event) {
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 90dc613c8..f4ce3b1e8 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -161,7 +161,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             // add sso property for the postInstall message to be shown correctly
             $scope.appInstall.app.sso = data.sso;
 
-            Client.installApp($scope.appInstall.app.id, $scope.appInstall.app.manifest, $scope.appInstall.app.title, data, function (error) {
+            Client.installApp($scope.appInstall.app.id, $scope.appInstall.app.manifest, $scope.appInstall.app.title, data, function (error, newAppId) {
                 if (error) {
                     if (error.statusCode === 402) {
                         $scope.appInstall.state = 'appLimitReached';
@@ -191,6 +191,9 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
                 $scope.appInstall.busy = false;
 
+                // stash new app id for later
+                $scope.appInstall.app.id = newAppId;
+
                 $scope.appInstall.postInstall();
             });
         },
@@ -200,6 +203,11 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 $scope.appInstall.state = 'postInstall';
                 $('#collapseInstallForm').collapse('hide');
                 $('#postInstallMessage').collapse('show');
+
+                // we track the postinstall confirmation for the current user's browser
+                // TODO later we might want to have a notification db to track the state across admins and browsers
+                localStorage['confirmPostInstall_' + $scope.appInstall.app.id] = true;
+
                 return;
             }