diff --git a/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx b/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx
index 0e412532384..fcd5d1f9a28 100644
--- a/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx
+++ b/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx
@@ -10,6 +10,7 @@ import {
} from '@backstage/core-plugin-api';
import { usePermission } from '@backstage/plugin-permission-react';
+import { Tooltip } from '@mui/material';
import Button from '@mui/material/Button';
import Grid from '@mui/material/Grid';
import Skeleton from '@mui/material/Skeleton';
@@ -64,10 +65,13 @@ export const WorkflowDefinitionViewerPage = () => {
)}
- {loading ? (
+ {loading || loadingPermission ? (
) : (
- !loadingPermission && (
+
- )
+
)}
diff --git a/plugins/orchestrator/src/components/WorkflowInstancePage.tsx b/plugins/orchestrator/src/components/WorkflowInstancePage.tsx
index 798dafa152d..046c828c90b 100644
--- a/plugins/orchestrator/src/components/WorkflowInstancePage.tsx
+++ b/plugins/orchestrator/src/components/WorkflowInstancePage.tsx
@@ -13,6 +13,7 @@ import {
} from '@backstage/core-plugin-api';
import { usePermission } from '@backstage/plugin-permission-react';
+import { Tooltip } from '@mui/material';
import Button from '@mui/material/Button';
import Grid from '@mui/material/Grid';
@@ -211,39 +212,54 @@ export const WorkflowInstancePage = ({
{!canRerun && (
<>
-
+
+
-
+
+
>
)}
{!canAbort && (
-
+
+
)}