diff --git a/src/modules/nostr-feed/components/ScheduledEventCard.vue b/src/modules/nostr-feed/components/ScheduledEventCard.vue
index 5acfa51..b28fdef 100644
--- a/src/modules/nostr-feed/components/ScheduledEventCard.vue
+++ b/src/modules/nostr-feed/components/ScheduledEventCard.vue
@@ -10,6 +10,11 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog'
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from '@/components/ui/collapsible'
 import { Calendar, MapPin, Clock, CheckCircle } from 'lucide-vue-next'
 import type { ScheduledEvent, EventCompletion } from '../services/ScheduledEventService'
 
@@ -33,9 +38,6 @@ const emit = defineEmits<Emits>()
 // Confirmation dialog state
 const showConfirmDialog = ref(false)
 
-// Collapsed state (collapsed by default)
-const isExpanded = ref(false)
-
 // Event address for tracking completion
 const eventAddress = computed(() => `31922:${props.event.pubkey}:${props.event.dTag}`)
 
@@ -116,81 +118,56 @@ function confirmMarkComplete() {
 function cancelMarkComplete() {
   showConfirmDialog.value = false
 }
-
-// Toggle expanded/collapsed state
-function toggleExpanded() {
-  isExpanded.value = !isExpanded.value
-}
 </script>
 
 <template>
-  <div class="border-b md:border md:rounded-lg bg-card transition-all"
-       :class="{ 'opacity-60': isCompletable && isCompleted }">
-
-    <!-- Collapsed View (Default) -->
-    <div v-if="!isExpanded"
-         class="flex items-center gap-3 p-3 md:p-4">
-      <!-- Time -->
-      <div @click="toggleExpanded" class="flex items-center gap-1.5 text-sm text-muted-foreground shrink-0 cursor-pointer">
-        <Clock class="h-3.5 w-3.5" />
-        <span class="font-medium">{{ formattedTimeRange || formattedDate }}</span>
-      </div>
-
-      <!-- Title -->
-      <h3 @click="toggleExpanded"
-          class="font-semibold text-sm md:text-base flex-1 truncate cursor-pointer hover:text-foreground/80 transition-colors"
-          :class="{ 'line-through': isCompletable && isCompleted }">
-        {{ event.title }}
-      </h3>
-
-      <!-- Badges and Actions -->
-      <div class="flex items-center gap-2 shrink-0">
-        <!-- Mark Complete Button (for uncompleted tasks) -->
-        <Button
-          v-if="isCompletable && !isCompleted"
-          @click.stop="handleMarkComplete"
-          variant="ghost"
-          size="sm"
-          class="h-7 w-7 p-0"
-        >
-          <CheckCircle class="h-4 w-4" />
-        </Button>
-
-        <!-- Completed Badge -->
-        <Badge v-if="isCompletable && isCompleted" variant="secondary" class="text-xs">
-          ✓
-        </Badge>
-
-        <!-- Admin Badge -->
-        <Badge v-if="isAdminEvent" variant="secondary" class="text-xs">
-          Admin
-        </Badge>
-      </div>
-    </div>
-
-    <!-- Expanded View -->
-    <div v-else class="p-4 md:p-6">
-      <!-- Event Details -->
-      <div class="flex-1 min-w-0">
-        <!-- Title and badges with close button -->
-        <div class="flex items-start gap-2 mb-2 flex-wrap">
-          <h3 class="font-semibold text-base md:text-lg flex-1"
-              :class="{ 'line-through': isCompletable && isCompleted }">
-            {{ event.title }}
-          </h3>
-          <Badge v-if="isAdminEvent" variant="secondary" class="shrink-0">
-            Admin
-          </Badge>
-          <Button
-            @click="toggleExpanded"
-            variant="ghost"
-            size="sm"
-            class="h-6 w-6 p-0 shrink-0"
-          >
-            ✕
-          </Button>
+  <Collapsible class="border-b md:border md:rounded-lg bg-card transition-all"
+               :class="{ 'opacity-60': isCompletable && isCompleted }">
+    <!-- Collapsed View (Trigger) -->
+    <CollapsibleTrigger as-child>
+      <div class="flex items-center gap-3 p-3 md:p-4 cursor-pointer hover:bg-accent/50 transition-colors">
+        <!-- Time -->
+        <div class="flex items-center gap-1.5 text-sm text-muted-foreground shrink-0">
+          <Clock class="h-3.5 w-3.5" />
+          <span class="font-medium">{{ formattedTimeRange || formattedDate }}</span>
         </div>
 
+        <!-- Title -->
+        <h3 class="font-semibold text-sm md:text-base flex-1 truncate"
+            :class="{ 'line-through': isCompletable && isCompleted }">
+          {{ event.title }}
+        </h3>
+
+        <!-- Badges and Actions -->
+        <div class="flex items-center gap-2 shrink-0">
+          <!-- Mark Complete Button (for uncompleted tasks) -->
+          <Button
+            v-if="isCompletable && !isCompleted"
+            @click.stop="handleMarkComplete"
+            variant="ghost"
+            size="sm"
+            class="h-7 w-7 p-0"
+          >
+            <CheckCircle class="h-4 w-4" />
+          </Button>
+
+          <!-- Completed Badge -->
+          <Badge v-if="isCompletable && isCompleted" variant="secondary" class="text-xs">
+            ✓
+          </Badge>
+
+          <!-- Admin Badge -->
+          <Badge v-if="isAdminEvent" variant="secondary" class="text-xs">
+            Admin
+          </Badge>
+        </div>
+      </div>
+    </CollapsibleTrigger>
+
+    <!-- Expanded View (Content) -->
+    <CollapsibleContent class="p-4 md:p-6 pt-0">
+      <!-- Event Details -->
+      <div class="flex-1 min-w-0">
         <!-- Date/Time -->
         <div class="flex items-center gap-4 text-sm text-muted-foreground mb-2 flex-wrap">
           <div class="flex items-center gap-1.5">
@@ -238,22 +215,23 @@ function toggleExpanded() {
           </Button>
         </div>
       </div>
-    </div>
+    </CollapsibleContent>
 
-    <!-- Confirmation Dialog -->
-    <Dialog :open="showConfirmDialog" @update:open="(val: boolean) => showConfirmDialog = val">
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>Mark Event as Complete?</DialogTitle>
-          <DialogDescription>
-            This will mark "{{ event.title }}" as completed by you. Other users will be able to see that you completed this event.
-          </DialogDescription>
-        </DialogHeader>
-        <DialogFooter>
-          <Button variant="outline" @click="cancelMarkComplete">Cancel</Button>
-          <Button @click="confirmMarkComplete">Mark Complete</Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  </div>
+  </Collapsible>
+
+  <!-- Confirmation Dialog -->
+  <Dialog :open="showConfirmDialog" @update:open="(val: boolean) => showConfirmDialog = val">
+    <DialogContent>
+      <DialogHeader>
+        <DialogTitle>Mark Event as Complete?</DialogTitle>
+        <DialogDescription>
+          This will mark "{{ event.title }}" as completed by you. Other users will be able to see that you completed this event.
+        </DialogDescription>
+      </DialogHeader>
+      <DialogFooter>
+        <Button variant="outline" @click="cancelMarkComplete">Cancel</Button>
+        <Button @click="confirmMarkComplete">Mark Complete</Button>
+      </DialogFooter>
+    </DialogContent>
+  </Dialog>
 </template>