diff --git a/public/app/core/components/NestedFolderPicker/FolderRepo.tsx b/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
index 7eff53a058e..dba98470ce4 100644
--- a/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
+++ b/public/app/core/components/NestedFolderPicker/FolderRepo.tsx
@@ -1,6 +1,5 @@
 import { Badge } from '@grafana/ui';
 import { t } from 'app/core/internationalization';
-import { ManagerKind } from 'app/features/apiserver/types';
 import { useIsProvisionedInstance } from 'app/features/provisioning/hooks/useIsProvisionedInstance';
 import { NestedFolderDTO } from 'app/features/search/service/types';
 import { FolderDTO, FolderListItemDTO } from 'app/types';
@@ -11,12 +10,7 @@ export interface Props {
 
 export function FolderRepo({ folder }: Props) {
   const isProvisionedInstance = useIsProvisionedInstance();
-  if (
-    !folder ||
-    ('parentUID' in folder && folder.parentUID) ||
-    folder.managedBy !== ManagerKind.Repo ||
-    isProvisionedInstance
-  ) {
+  if (!folder || ('parentUID' in folder && folder.parentUID) || !folder.managedBy || isProvisionedInstance) {
     return null;
   }
 
diff --git a/public/app/features/dashboard-scene/scene/ManagedDashboardNavBarBadge.tsx b/public/app/features/dashboard-scene/scene/ManagedDashboardNavBarBadge.tsx
index 9594e1c1eb3..6b2303fef1b 100644
--- a/public/app/features/dashboard-scene/scene/ManagedDashboardNavBarBadge.tsx
+++ b/public/app/features/dashboard-scene/scene/ManagedDashboardNavBarBadge.tsx
@@ -14,10 +14,13 @@ export default function ManagedDashboardNavBarBadge({ meta }: { meta: DashboardM
   switch (kind) {
     case ManagerKind.Terraform:
       text = 'Terraform';
+      break;
     case ManagerKind.Kubectl:
       text = 'Kubectl';
+      break;
     case ManagerKind.Plugin:
       text = `Plugin: ${id}`;
+      break;
   }
   return <Badge color="darkgrey" icon="exchange-alt" text={text} key="provisioned-dashboard-button-badge" />;
 }
diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index de4951a315d..a2a80b4800f 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -135,7 +135,7 @@ export function ToolbarActions({ dashboard }: Props) {
     });
   }
 
-  if (isManaged && meta.canEdit) {
+  if (dashboard.isManaged() && meta.canEdit) {
     toolbarActions.push({
       group: 'icon-actions',
       condition: true,