diff --git a/src/theme.scss b/src/theme.scss
index 99bb45a5c..10fce889a 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -101,10 +101,6 @@ $state-danger-border:                       $brand-danger;
     max-width: 300px;
 }
 
-.dropdown-menu {
-    min-width: 190px;
-}
-
 .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
     background-color: $brand-primary;
     color: white;
@@ -486,10 +482,6 @@ multiselect {
         div {
             text-align: right;
             padding-top: 10px;
-
-            a {
-                margin-top: 10px;
-            }
         }
     }
 }
diff --git a/src/views/app.html b/src/views/app.html
index 5f4f41b24..eb6701dc4 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -151,6 +151,23 @@
   </div>
 </div>
 
+<!-- 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>
+      </div>
+    </div>
+  </div>
+
 <!-- Modal update app -->
 <div class="modal fade" id="updateModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -251,8 +268,19 @@
           <span class="text-small">{{ app | installationStateLabel:user }}</span>
         </h1>
         <div>
-          <a class="btn btn-sm btn-outline btn-primary" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
-          <a class="btn btn-sm btn-outline btn-primary" ng-href="{{ app | applicationLink }}" target="_blank" ng-disabled="!(app | appIsInstalledAndHealthy)" ng-click="user.admin && ((app | installError) === true && setView('debug')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && postInstallConfirm.show())"><i class="fas fa-external-link-alt"></i> Open App</a>
+          <div class="dropdown">
+            <button class="btn btn-sm btn-primary 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()"><i class="fas fa-star-of-life fa-fw"></i> First Time Setup</a></li>
+              <li><a ng-href="{{ app.manifest.documentationUrl }}" target="_blank"><i class="fas fa-book fa-fw"></i> Documentation</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a ng-href="{{ app.manifest.website }}" target="_blank"><i class="fas fa-external-link-alt fa-fw"></i> Project Website</a></li>
+            </ul>
+          </div>
+          <a class="btn btn-sm btn-outline btn-primary" style="margin-top: 10px;" ng-href="{{ app | applicationLink }}" target="_blank" ng-disabled="!(app | appIsInstalledAndHealthy)" ng-click="user.admin && ((app | installError) === true && setView('debug')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && postInstallConfirm.show())"><i class="fas fa-external-link-alt"></i> Open App</a>
         </div>
       </div>
     </div>
diff --git a/src/views/app.js b/src/views/app.js
index d04b47e0e..798141e84 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -77,6 +77,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         $scope.view = view;
     };
 
+    $scope.showPostInstall = function () {
+        if (!$scope.app.manifest.postInstallMessage) return;
+        $('#postInstallModal').modal('show');
+    };
+
     $scope.display = {
         busy: false,
         error: {},