diff --git a/src/views/apps.html b/src/views/apps.html
index 476315347..f66ae6296 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -54,12 +54,12 @@
           If you need further help, refer to Cloudron's <a target="_blank" ng-href="{{ appInfo.app.manifest.forumUrl || 'https://forum.cloudron.io' }}">{{ appInfo.app.manifest.title }} forum section</a>.
         </p>
 
-        <a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfo_postinstall_message">
+        <a ng-show="appInfo.app.manifest.postInstallMessage" href="" data-toggle="collapse" data-parent="#accordion" data-target="#appinfoPostinstallMessage">
           <i class="fa fa-angle-right"></i>
           First time setup instructions
         </a>
 
-        <div id="appinfo_postinstall_message" class="panel-collapse collapse">
+        <div id="appinfoPostinstallMessage" class="panel-collapse collapse">
           <br/>
           <div ng-bind-html="appInfo.app.manifest.postInstallMessage | postInstallMessage:appInfo.app | markdown2html"></div>
         </div>
diff --git a/src/views/apps.js b/src/views/apps.js
index 0ea4d18d3..dcb496e07 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -62,6 +62,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$timeout'
             $scope.appInfo.app = app;
             $scope.appInfo.message = app.manifest.postInstallMessage;
 
+            $('#appinfoPostinstallMessage').collapse('hide');
             $('#appInfoModal').modal('show');
 
             return false; // prevent propagation and default