diff --git a/frontend/components/dialog/events/event-dialog.tsx b/frontend/components/dialog/events/event-dialog.tsx
index 78ae444..5f05ca6 100644
--- a/frontend/components/dialog/events/event-dialog.tsx
+++ b/frontend/components/dialog/events/event-dialog.tsx
@@ -43,7 +43,7 @@ export function EventDialog({
             <DialogHeader>
               <DialogTitle className={"flex justify-between items-center"}>
                 <span className={"flex items-center"}>
-                  {event ? (
+                  {event?.title  ? (
                     <>
                       <Edit2 size={18} className={"inline mr-2"} /> Event
                       bearbeiten
diff --git a/frontend/components/dialog/events/event-form.tsx b/frontend/components/dialog/events/event-form.tsx
index b737771..618197d 100644
--- a/frontend/components/dialog/events/event-form.tsx
+++ b/frontend/components/dialog/events/event-form.tsx
@@ -176,7 +176,7 @@ export function EventForm({ event, edit, onCloseAction }: EventFormProps) {
       from: formatDateToHHMM(event ? new Date(event.from) : new Date()),
       to: formatDateToHHMM(
         event ? new Date(event.to) : new Date(Date.now() + 30 * 60 * 1000)
-      ),
+	),
       topicIDs: event?.topics.map((t) => t.ID),
       typeID: event?.type.ID,
       needsTutors: event?.needsTutors ?? true,
@@ -208,8 +208,8 @@ export function EventForm({ event, edit, onCloseAction }: EventFormProps) {
       registrationNeeded: data.registrationNeeded,
       umbrellaID: data.umbrellaID,
     };
-
-    if (event) await handleUpdate(data, newEvent);
+      
+    if (event?.title) await handleUpdate(data, newEvent);
     else await handleCreation(data, newEvent);
   }
 
diff --git a/frontend/components/event-calendar/day-view.tsx b/frontend/components/event-calendar/day-view.tsx
index 35e119a..82ea441 100644
--- a/frontend/components/event-calendar/day-view.tsx
+++ b/frontend/components/event-calendar/day-view.tsx
@@ -306,9 +306,7 @@ export function DayView({
                       )}
                       onClick={() => {
                         if (user?.role !== Role.Admin) return
-                        const startTime = currentDate;
-                        startTime.set({ hour: hourValue });
-                        startTime.set({ minute: quarter * 15 });
+                          const startTime = currentDate.set({hour: hourValue}).set({minute: quarter * 15});
                         onEventCreateAction(startTime);
                       }}
                     />
diff --git a/frontend/components/event-calendar/event-calendar.tsx b/frontend/components/event-calendar/event-calendar.tsx
index d205094..9f076f9 100644
--- a/frontend/components/event-calendar/event-calendar.tsx
+++ b/frontend/components/event-calendar/event-calendar.tsx
@@ -167,7 +167,7 @@ export function EventCalendar({
     setIsEventDialogOpen(true);
   };
 
-  const handleEventCreate = (startTime: DateTime) => {
+    const handleEventCreate = (startTime: DateTime) => {
     // Snap to 15-minute intervals
     const minutes = startTime.minute;
     const remainder = minutes % 15;
@@ -328,8 +328,9 @@ export function EventCalendar({
             <Button
               className="max-[479px]:aspect-square max-[479px]:p-0!"
               onClick={() => {
-                setSelectedEvent(null); // Ensure we're creating a new event
-                setIsEventDialogOpen(true);
+		  //                  setSelectedEvent(null); // Ensure we're creating a new event
+		  		  handleEventCreate(DateTime.now())
+		  //              setIsEventDialogOpen(true);
               }}
             >
               <PlusIcon
diff --git a/frontend/components/event-calendar/month-view.tsx b/frontend/components/event-calendar/month-view.tsx
index fd09cbf..d78be05 100644
--- a/frontend/components/event-calendar/month-view.tsx
+++ b/frontend/components/event-calendar/month-view.tsx
@@ -139,8 +139,7 @@ export function MonthView({
                     date={day}
                     onClick={() => {
                       if (user?.role !== Role.Admin) return
-                      const startTime = day;
-                      startTime.set({ hour: DefaultStartHour });
+			const startTime = day.set({hour: DefaultStartHour});
                       onEventCreateAction(startTime);
                     }}
                   >
diff --git a/frontend/components/event-calendar/week-view.tsx b/frontend/components/event-calendar/week-view.tsx
index 9e2348e..cf01e96 100644
--- a/frontend/components/event-calendar/week-view.tsx
+++ b/frontend/components/event-calendar/week-view.tsx
@@ -384,10 +384,8 @@ export function WeekView({
                         )}
                         onClick={() => {
                           if (user?.role !== Role.Admin) return
-                          const startTime = day.setZone(TimeZone);
-                          startTime.set({ hour: hourValue });
-                          startTime.set({ minute: quarter * 15 });
-                          onEventCreateAction(startTime);
+			    const startTime = day.setZone(TimeZone).set({hour: hourValue}).set({minute: quarter * 15})
+                           onEventCreateAction(startTime);
                         }}
                       />
                     );