diff --git a/webclient/src/components/script/ActionScriptsGrid.vue b/webclient/src/components/script/ActionScriptsGrid.vue
index 8f7b3e1..9be6315 100644
--- a/webclient/src/components/script/ActionScriptsGrid.vue
+++ b/webclient/src/components/script/ActionScriptsGrid.vue
@@ -1,36 +1,38 @@
 <template>
   <div class="area-grid">
-    <GnActionCard
+    <div
       v-for="script in scripts"
       :key="script.alias"
-      :title="script.name"
+      class="action-card-item"
       :class="cardClass(script)"
       @click="goToDetail(script.alias)"
     >
-      <template #default>
-        <div v-if="script.icon" v-html="script.icon" class="script-icon" />
-        <p v-if="script.description">{{ script.description }}</p>
-        <div class="script-meta">
-          <GnBadge :variant="script.state === 'enabled' ? 'success' : 'secondary'"
-          >{{ script.state }}</GnBadge>
-          <GnBadge v-if="script.scope" variant="primary">{{ script.scope }}</GnBadge>
-          <GnBadge v-if="showAreaBadge && areaFor(script)" variant="primary">{{ areaFor(script).display_name }}</GnBadge>
-        </div>
-        <small v-if="script.created_by || script.author">{{ script.created_by || script.author }}</small>
-      </template>
-      <template #actions>
-        <GnButton
-          v-if="perm.has('scripts.run')"
-          variant="primary"
-          icon="ph-play"
-          :loading="scriptsStore.isRunning(script.alias)"
-          :disabled="script.state !== 'enabled'"
-          @click.stop="run(script)"
-        >
-          Run
-        </GnButton>
-      </template>
-    </GnActionCard>
+      <GnActionCard :title="script.name">
+        <template #default>
+          <div v-if="script.icon" v-html="script.icon" class="script-icon" />
+          <p v-if="script.description">{{ script.description }}</p>
+          <div class="script-meta">
+            <GnBadge :variant="script.state === 'enabled' ? 'success' : 'secondary'"
+            >{{ script.state }}</GnBadge>
+            <GnBadge v-if="script.scope" variant="primary">{{ script.scope }}</GnBadge>
+            <GnBadge v-if="showAreaBadge && areaFor(script)" variant="primary">{{ areaFor(script).display_name }}</GnBadge>
+          </div>
+          <small v-if="script.created_by || script.author">{{ script.created_by || script.author }}</small>
+        </template>
+        <template #actions>
+          <GnButton
+            v-if="perm.has('scripts.run')"
+            variant="primary"
+            icon="ph-play"
+            :loading="scriptsStore.isRunning(script.alias)"
+            :disabled="script.state !== 'enabled'"
+            @click.stop="run(script)"
+          >
+            Run
+          </GnButton>
+        </template>
+      </GnActionCard>
+    </div>
   </div>
   <ScriptRunModal
     v-if="activeScript"
@@ -99,19 +101,12 @@
 }
 
 function cardClass(script) {
-  if (script.danger_level === "dangerous") return "text-danger card-dangerous";
-  if (script.danger_level === "cautious") return "text-warning card-cautious";
+  if (script.danger_level === "dangerous") return "card-dangerous";
+  if (script.danger_level === "cautious") return "card-cautious";
   return "";
 }
 
 function run(script) {
-  const schema = script.params_schema;
-  if (schema && Object.keys(schema).length > 0) {
-    activeScript.value = script;
-    showRunModal.value = true;
-    return;
-  }
-
   if (script.danger_level === "cautious" || script.danger_level === "dangerous") {
     confirmScript.value = script;
     confirmTitle.value = `Run: ${script.name || script.alias}`;
@@ -124,12 +119,25 @@
     return;
   }
 
+  const schema = script.params_schema;
+  if (schema && Object.keys(schema).length > 0) {
+    activeScript.value = script;
+    showRunModal.value = true;
+    return;
+  }
+
   executeRun(script.alias, {});
 }
 
 function onConfirmRun() {
   if (confirmScript.value) {
-    executeRun(confirmScript.value.alias, {});
+    const schema = confirmScript.value.params_schema;
+    if (schema && Object.keys(schema).length > 0) {
+      activeScript.value = confirmScript.value;
+      showRunModal.value = true;
+    } else {
+      executeRun(confirmScript.value.alias, {});
+    }
     confirmScript.value = null;
   }
 }
@@ -168,11 +176,11 @@
   align-items: center;
 }
 
-.card-cautious.action-card {
-  border-color: currentColor;
+.action-card-item.card-cautious :deep(.action-card) {
+  border-color: #e0af68;
 }
 
-.card-dangerous.action-card {
-  border-color: currentColor;
+.action-card-item.card-dangerous :deep(.action-card) {
+  border-color: #f7768e;
 }
 </style>