diff --git a/src/filemanager.html b/src/filemanager.html
index 643e87934..c656a16c4 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -129,7 +129,12 @@
   <div class="main-container animateMe ng-hide layout-root" ng-show="initialized">
     <div class="layout-content container">
       <br/>
-      <div class="row">
+      <div class="row" ng-hide="app">
+        <div class="col-md-12 text-center">
+          <h3>App not found</h3>
+        </div>
+      </div>
+      <div class="row" ng-show="app">
         <div class="col-md-12">
           <div class="card card-large">
 
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 79e34492a..07ac1838d 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -268,7 +268,10 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
                 if (error) return Client.initError(error, init);
 
                 Client.getApp($scope.appId, function (error, result) {
-                    if (error) return Client.initError(error, init);
+                    if (error) {
+                        $scope.initialized = true;
+                        return;
+                    }
 
                     $scope.app = result;