diff --git a/src/components/DeviceNameAndGroup.vue b/src/components/DeviceNameAndGroup.vue
index bba1f42..680b320 100644
--- a/src/components/DeviceNameAndGroup.vue
+++ b/src/components/DeviceNameAndGroup.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Device } from '@/model/devices-management/Device'
 import DeviceGroupsButton from './DeviceGroupsButton.vue'
+import { useGroupsStore } from '@/stores/groups'
 
 defineProps<{
   id: string
@@ -10,7 +11,15 @@ defineProps<{
 
 <template>
   <span class="grid grid-cols-1 sm:grid-cols-7 gap-1">
-    <span class="sm:col-span-3"> {{ device.name }}</span>
+    <span
+      :class="
+        useGroupsStore().getGroupsOfDevice(device.id).length === 0
+          ? 'col-span-full'
+          : 'sm:col-span-3'
+      "
+    >
+      {{ device.name }}</span
+    >
     <DeviceGroupsButton :id="id" :device="device" class="sm:col-span-4" />
   </span>
 </template>
diff --git a/src/components/tasks-automations/TriggerComponent.vue b/src/components/tasks-automations/TriggerComponent.vue
index 49a70f1..8644f36 100644
--- a/src/components/tasks-automations/TriggerComponent.vue
+++ b/src/components/tasks-automations/TriggerComponent.vue
@@ -8,8 +8,10 @@ import {
   formatDateForDatetimeLocalInput,
   formatDuration,
 } from './timeUtils'
-import type { Device } from '@/model/devices-management/Device'
+import type { Device, DeviceId } from '@/model/devices-management/Device'
 import { useDevicesStore } from '@/stores/devices'
+import DeviceNameAndGroup from '../DeviceNameAndGroup.vue'
+import { useGroupsStore } from '@/stores/groups'
 
 const props = defineProps<{
   trigger?: Trigger
@@ -151,6 +153,18 @@ function closeDialog() {
 onMounted(() => {
   devices.value = useDevicesStore().devices
 })
+
+function groupsToString(deviceId: DeviceId) {
+  const deviceGroups = useGroupsStore().getGroupsOfDevice(deviceId)
+  return deviceGroups.length > 0
+    ? '(' +
+        deviceGroups[0].name +
+        (deviceGroups.length > 1
+          ? ', ' + deviceGroups[1].name + (deviceGroups.length > 2 ? ', ...' : '')
+          : '') +
+        ')'
+    : ''
+}
 </script>
 
 <template>
@@ -204,10 +218,12 @@ onMounted(() => {
       </template>
       <!-- Device Event trigger -->
       <template v-else-if="isDeviceEventTrigger(trigger) && selectedDevice">
-        <p class="col-span-full font-bold text-center">{{ selectedDevice.name }}</p>
+        <p class="col-span-full font-bold justify-self-center w-55 text-center">
+          <DeviceNameAndGroup :id="selectedDevice.id" :device="selectedDevice" />
+        </p>
         <select
           v-model="selectedEvent"
-          class="col-span-full select h-7 w-45 select-primary justify-self-center text-center"
+          class="col-span-full select h-7 w-50 select-primary justify-self-center text-center"
           v-if="edit"
         >
           <option selected disabled>Pick an event</option>
@@ -239,6 +255,7 @@ onMounted(() => {
         <template v-for="device in devices" :key="device.id">
           <option :value="device" v-if="device.events.length !== 0">
             {{ device.name }}
+            {{ groupsToString(device.id) }}
           </option>
         </template>
       </select>