diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts
index b4c2d2f6827..d26d64ced28 100644
--- a/public/app/features/dashboard/acl/acl.ts
+++ b/public/app/features/dashboard/acl/acl.ts
@@ -90,7 +90,7 @@ export class AclCtrl {
     }
 
     return this.backendSrv.post(`/api/dashboards/id/${this.dashboard.id}/acl`, {
-      items: updated
+      items: updated,
     });
   }
 
@@ -169,9 +169,9 @@ export function dashAclModal() {
     bindToController: true,
     controllerAs: 'ctrl',
     scope: {
-      dashboard: "=",
-      meta: "="
-    }
+      dashboard: '=',
+      meta: '=',
+    },
   };
 }
 
diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts
index c2ec057ab8d..2f9ef382a8e 100755
--- a/public/app/features/dashboard/folder_page_loader.ts
+++ b/public/app/features/dashboard/folder_page_loader.ts
@@ -50,15 +50,20 @@ export class FolderPageLoader {
       });
       dashTab.url = folderUrl;
 
-      const permTab = _.find(ctrl.navModel.main.children, {
-        id: 'manage-folder-permissions',
-      });
-      permTab.url = folderUrl + '/permissions';
+        if (result.meta.canAdmin) {
+          const permTab = _.find(ctrl.navModel.main.children, {
+            id: 'manage-folder-permissions',
+          });
 
-      const settingsTab = _.find(ctrl.navModel.main.children, {
-        id: 'manage-folder-settings',
-      });
-      settingsTab.url = folderUrl + '/settings';
+          permTab.url = folderUrl + '/permissions';
+
+          const settingsTab = _.find(ctrl.navModel.main.children, {
+            id: 'manage-folder-settings',
+          });
+          settingsTab.url = folderUrl + '/settings';
+        } else {
+          ctrl.navModel.main.children = [dashTab];
+        }
 
       return result;
     });