diff --git a/src/views/app.html b/src/views/app.html
index 51e8552bc..ccb70f5b2 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -153,20 +153,25 @@
 
 <!-- Modal postinstall -->
 <div class="modal fade" id="postInstallModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h4>First Time Setup</h4>
-        </div>
-        <div class="modal-body">
-          <div ng-bind-html="app.manifest.postInstallMessage | postInstallMessage:app | markdown2html"></div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4>First Time Setup</h4>
+      </div>
+      <div class="modal-body">
+        <div ng-bind-html="app.manifest.postInstallMessage | postInstallMessage:app | markdown2html"></div>
+      </div>
+      <div class="modal-footer">
+        <div class="form-group pull-left" ng-show="postInstallMessage.openApp">
+          <input type="checkbox" id="appPostInstallConfirmCheckbox" ng-model="postInstallMessage.confirmed">
+          <label class="control-label" for="appPostInstallConfirmCheckbox">Acknowledge instructions</label>
         </div>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <a class="btn btn-success" ng-href="{{ postInstallMessage.confirmed ? ('https://' + app.fqdn) : '' }}" target="_blank" ng-disabled="!postInstallMessage.confirmed" ng-click="postInstallMessage.submit()" ng-show="postInstallMessage.openApp">Open {{ app.manifest.title }}</a>
       </div>
     </div>
   </div>
+</div>
 
 <!-- Modal update app -->
 <div class="modal fade" id="updateModal" tabindex="-1" role="dialog">
@@ -267,18 +272,18 @@
     <div class="col-md-8">
       <div class="app-header-container">
         <h1>
-          <a ng-href="{{ app | applicationLink }}" target="_blank">{{ app.label || app.fqdn }} <sup ng-show="app | appIsInstalledAndHealthy"><i class="fas fa-external-link-alt" style="font-size: 12px;"></i></sup></a>
+          <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>
           <br/>
           <span class="text-small">{{ app | installationStateLabel:user }}</span>
         </h1>
         <div>
           <div class="dropdown">
-            <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+            <button class="btn btn-sm btn-info dropdown-toggle" type="button" data-toggle="dropdown">
               Documentation
               <span class="caret"></span>
             </button>
             <ul class="dropdown-menu dropdown-menu-right">
-              <li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="showPostInstall()">First Time Setup</a></li>
+              <li ng-class="{ 'disabled': !app.manifest.postInstallMessage }"><a href="" ng-click="postInstallMessage.show(false)">First Time Setup</a></li>
               <li><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a></li>
               <li role="separator" class="divider"></li>
               <li><a ng-href="{{ app.manifest.website }}" target="_blank">Project Website</a></li>
diff --git a/src/views/app.js b/src/views/app.js
index 38e097d91..dcdb7b810 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -77,9 +77,26 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         $scope.view = view;
     };
 
-    $scope.showPostInstall = function () {
-        if (!$scope.app.manifest.postInstallMessage) return;
-        $('#postInstallModal').modal('show');
+    $scope.postInstallMessage = {
+        confirmed: false,
+        openApp: false,
+
+        show: function (openApp) {
+            $scope.postInstallMessage.confirmed = false;
+            $scope.postInstallMessage.openApp = !!openApp;
+
+            if (!$scope.app.manifest.postInstallMessage) return;
+            $('#postInstallModal').modal('show');
+        },
+
+        submit: function () {
+            if (!$scope.postInstallMessage.confirmed) return;
+
+            $scope.app.pendingPostInstallConfirmation = false;
+            delete localStorage['confirmPostInstall_' + $scope.app.id];
+
+            $('#postInstallModal').modal('hide');
+        }
     };
 
     $scope.display = {
diff --git a/src/views/apps.html b/src/views/apps.html
index edf47907c..01a69b874 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -19,10 +19,10 @@
         </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">Acknowledge instructions</label>
-          </div>
+        <div class="form-group pull-left">
+          <input type="checkbox" id="appPostInstallConfirmCheckbox" ng-model="appPostInstallConfirm.confirmed">
+          <label class="control-label" for="appPostInstallConfirmCheckbox">Acknowledge 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>