diff --git a/ui/src/config/section/infra/clusters.js b/ui/src/config/section/infra/clusters.js
index d2d748da6d5..5ba3dfd5d8b 100644
--- a/ui/src/config/section/infra/clusters.js
+++ b/ui/src/config/section/infra/clusters.js
@@ -68,7 +68,7 @@ export default {
       message: 'message.action.manage.cluster',
       dataView: true,
       defaultArgs: { managedstate: 'Managed' },
-      show: (record) => { return record.clustertype === 'CloudManaged' && ['PrepareUnmanaged', 'Unmanaged'].includes(record.state) }
+      show: (record) => { return record.managedstate !== 'Managed' }
     },
     {
       api: 'updateCluster',
@@ -77,7 +77,7 @@ export default {
       message: 'message.action.unmanage.cluster',
       dataView: true,
       defaultArgs: { managedstate: 'Unmanaged' },
-      show: (record) => { return record.clustertype === 'CloudManaged' && record.state === 'Enabled' }
+      show: (record) => { return record.managedstate === 'Managed' }
     },
     {
       api: 'enableOutOfBandManagementForCluster',