diff --git a/src/views/app.html b/src/views/app.html
index d5cd51ff5..cb2aba94e 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -630,13 +630,13 @@
         <div ng-click="setView('display')" ng-class="{ 'active': view === 'display' }">{{ 'app.displayTabTitle' | tr }}</div>
         <div ng-click="setView('location')" ng-class="{ 'active': view === 'location' }" ng-show="app.accessLevel === 'admin'">{{ 'app.locationTabTitle' | tr }}</div>
         <div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }" ng-show="app.accessLevel === 'admin'">{{ 'app.accessControlTabTitle' | tr }}</div>
-        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }" ng-show="!isProxyApp(app)">{{ 'app.resourcesTabTitle' | tr }}</div>
-        <div ng-click="setView('storage')" ng-class="{ 'active': view === 'storage' }" ng-show="app.accessLevel === 'admin' && !isProxyApp(app)">{{ 'app.storageTabTitle' | tr }}</div>
-        <div ng-click="setView('graphs')" ng-class="{ 'active': view === 'graphs' }" ng-show="!isProxyApp(app)">{{ 'app.graphsTabTitle' | tr }}</div>
-        <div ng-click="setView('proxy')" ng-class="{ 'active': view === 'proxy' }" ng-show="isProxyApp(app)">Proxy</div>
+        <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }" ng-show="app.type !== APP_TYPES.PROXIED">{{ 'app.resourcesTabTitle' | tr }}</div>
+        <div ng-click="setView('storage')" ng-class="{ 'active': view === 'storage' }" ng-show="app.accessLevel === 'admin' && app.type !== APP_TYPES.PROXIED">{{ 'app.storageTabTitle' | tr }}</div>
+        <div ng-click="setView('graphs')" ng-class="{ 'active': view === 'graphs' }" ng-show="app.type !== APP_TYPES.PROXIED">{{ 'app.graphsTabTitle' | tr }}</div>
+        <div ng-click="setView('proxy')" ng-class="{ 'active': view === 'proxy' }" ng-show="app.type === APP_TYPES.PROXIED">Proxy</div>
         <div ng-click="setView('security')" ng-class="{ 'active': view === 'security' }">{{ 'app.securityTabTitle' | tr }}</div>
-        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }" ng-show="app.accessLevel === 'admin' && (app.manifest.addons.sendmail || app.manifest.addons.recvmail) && !isProxyApp(app)">{{ 'app.emailTabTitle' | tr }}</div>
-        <div ng-click="setView('cron')" ng-class="{ 'active': view === 'cron' }" ng-show="!isProxyApp(app)">{{ 'app.cronTabTitle' | tr }}</div>
+        <div ng-click="setView('email')" ng-class="{ 'active': view === 'email' }" ng-show="app.accessLevel === 'admin' && (app.manifest.addons.sendmail || app.manifest.addons.recvmail) && app.type !== APP_TYPES.PROXIED">{{ 'app.emailTabTitle' | tr }}</div>
+        <div ng-click="setView('cron')" ng-class="{ 'active': view === 'cron' }" ng-show="app.type !== APP_TYPES.PROXIED">{{ 'app.cronTabTitle' | tr }}</div>
         <div ng-click="setView('updates')" ng-class="{ 'active': view === 'updates' }">{{ 'app.updatesTabTitle' | tr }}</div>
         <div ng-click="setView('backups')" ng-class="{ 'active': view === 'backups' }">{{ 'app.backupsTabTitle' | tr }}</div>
         <div ng-click="setView('repair')" ng-class="{ 'active': view === 'repair' }">{{ 'app.repairTabTitle' | tr }}</div>
diff --git a/src/views/app.js b/src/views/app.js
index 8133c685e..d375eccf3 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -9,6 +9,7 @@
 /* global Chart */
 /* global Clipboard */
 /* global SECRET_PLACEHOLDER */
+/* global APP_TYPES */
 
 angular.module('Application').controller('AppController', ['$scope', '$location', '$translate', '$timeout', '$interval', '$route', '$routeParams', 'Client', function ($scope, $location, $translate, $timeout, $interval, $route, $routeParams, Client) {
     // List is from http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
@@ -153,6 +154,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
     $scope.users = [];
     $scope.backupConfig = null;
 
+    $scope.APP_TYPES = APP_TYPES;
     $scope.HOST_PORT_MIN = 1;
     $scope.HOST_PORT_MAX = 65535;
     $scope.ROBOTS_DISABLE_INDEXING_TEMPLATE = '# Disable search engine indexing\n\nUser-agent: *\nDisallow: /';
@@ -165,12 +167,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         $scope.view = view;
     };
 
-    $scope.isProxyApp = function (app) {
-        if (!app || !app.manifest) return false;
-
-        return app.manifest.id === 'io.cloudron.builtin.appproxy';
-    };
-
     $scope.stopAppTask = function (taskId) {
         Client.stopTask(taskId, function (error) {
             // we can ignore a call trying to cancel an already done task