diff --git a/packages/entities/entities-plugins/src/components/PluginList.vue b/packages/entities/entities-plugins/src/components/PluginList.vue
index 2aa7000b66..95328e1a30 100644
--- a/packages/entities/entities-plugins/src/components/PluginList.vue
+++ b/packages/entities/entities-plugins/src/components/PluginList.vue
@@ -207,7 +207,7 @@
     <EntityDeleteModal
       :action-pending="isDeletePending"
       :description="t('delete.description')"
-      :entity-name="pluginToBeDeleted && (pluginToBeDeleted.name || pluginToBeDeleted.id)"
+      :entity-name="pluginToBeDeleted && (pluginToBeDeleted.instance_name || pluginToBeDeleted.name || pluginToBeDeleted.id)"
       :entity-type="EntityTypes.Plugin"
       :error="deleteModalError"
       :title="t('delete.title')"
diff --git a/packages/entities/entities-plugins/src/locales/en.json b/packages/entities/entities-plugins/src/locales/en.json
index 3c26ec85a1..1d64dedb23 100644
--- a/packages/entities/entities-plugins/src/locales/en.json
+++ b/packages/entities/entities-plugins/src/locales/en.json
@@ -9,7 +9,7 @@
     "configure_dynamic_ordering": "Configure Dynamic Ordering"
   },
   "delete": {
-    "title": "Delete Plugin",
+    "title": "Delete a Plugin",
     "description": "Are you sure you want to delete this plugin? This action cannot be reversed."
   },
   "copy": {
diff --git a/packages/entities/entities-shared/docs/entity-base-table.md b/packages/entities/entities-shared/docs/entity-base-table.md
index d78d5c58db..f910ccee06 100644
--- a/packages/entities/entities-shared/docs/entity-base-table.md
+++ b/packages/entities/entities-shared/docs/entity-base-table.md
@@ -125,6 +125,9 @@ Table key to use for user table preferences. If empty, will fallback to use defa
 
 The table is rendered inside a `KCard`. `tttle` text is displayed in the upper left corner of the `KCard` above the table.
 
+#### `disableRowClick`
+Controls whether the table rows are clickable or not. Defaults to `false`. Setting to `true` will suppress the `click:row` event even if a `@click:row` handler is provided.
+
 ### Slots
 
 #### `toolbar-filter`
diff --git a/packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue b/packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue
index 879d508f2d..0acf4efd45 100644
--- a/packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue
+++ b/packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue
@@ -223,6 +223,11 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  /** default to false, setting to true will suppress the row click event even if "@click:row" is attached */
+  disableRowClick: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits<{
@@ -304,9 +309,13 @@ const clearSearchInput = () => {
   emit('clear-search-input')
 }
 
-const handleRowClick = (_: MouseEvent, row: BaseTableHeaders) => {
-  emit('click:row', row)
-}
+const handleRowClick = computed(() => {
+  return props.disableRowClick
+    ? undefined
+    : (_: MouseEvent, row: BaseTableHeaders) => {
+      emit('click:row', row)
+    }
+})
 
 const handleSortChanged = (sortParams: TableSortParams) => {
   emit('sort', sortParams)
diff --git a/packages/entities/entities-snis/src/components/SniList.vue b/packages/entities/entities-snis/src/components/SniList.vue
index 442cc85284..9facbf8b88 100644
--- a/packages/entities/entities-snis/src/components/SniList.vue
+++ b/packages/entities/entities-snis/src/components/SniList.vue
@@ -4,6 +4,7 @@
       :cache-identifier="cacheIdentifier"
       :cell-attributes="cellAttrsFn"
       disable-pagination-page-jump
+      :disable-row-click="true"
       :disable-sorting="disableSorting"
       :empty-state-options="emptyStateOptions"
       enable-entity-actions
diff --git a/packages/entities/entities-snis/src/locales/en.json b/packages/entities/entities-snis/src/locales/en.json
index 10598b00fe..74c02e769c 100644
--- a/packages/entities/entities-snis/src/locales/en.json
+++ b/packages/entities/entities-snis/src/locales/en.json
@@ -44,7 +44,7 @@
     "fields": {
       "name": {
         "label": "Name",
-        "placeholder": "Enter a unique name for this key set"
+        "placeholder": "Enter a unique name for this SNI"
       },
       "tags": {
         "label": "Tags",
diff --git a/packages/entities/entities-vaults/src/locales/en.json b/packages/entities/entities-vaults/src/locales/en.json
index 2b947439ae..d7e5619871 100644
--- a/packages/entities/entities-vaults/src/locales/en.json
+++ b/packages/entities/entities-vaults/src/locales/en.json
@@ -8,7 +8,7 @@
     "view": "View Details"
   },
   "delete": {
-    "title": "Delete Vault",
+    "title": "Delete a Vault",
     "description": "Are you sure you want to delete this vault? This action cannot be reversed."
   },
   "errors": {