diff --git a/nahbar/nahbar/AddMomentView.swift b/nahbar/nahbar/AddMomentView.swift
index 403ddca..7d6d3d6 100644
--- a/nahbar/nahbar/AddMomentView.swift
+++ b/nahbar/nahbar/AddMomentView.swift
@@ -76,6 +76,7 @@ struct AddMomentView: View {
 
     var body: some View {
         NavigationStack {
+            ScrollView {
             VStack(alignment: .leading, spacing: 20) {
 
                 // Person-Kontext-Chip
@@ -135,7 +136,7 @@ struct AddMomentView: View {
                         .padding(.vertical, 10)
                         .focused($isFocused)
                 }
-                .frame(minHeight: 180)
+                .frame(minHeight: 120)
                 .background(theme.surfaceCard)
                 .clipShape(RoundedRectangle(cornerRadius: theme.radiusCard))
                 .padding(.horizontal, 20)
@@ -158,13 +159,14 @@ struct AddMomentView: View {
                         .transition(.opacity.combined(with: .move(edge: .top)))
                 }
 
-                Spacer()
             }
             .animation(.easeInOut(duration: 0.2), value: showsCalendarSection)
             .animation(.easeInOut(duration: 0.2), value: showsReminderSection)
             .animation(.easeInOut(duration: 0.2), value: selectedType)
             .animation(.easeInOut(duration: 0.2), value: addToCalendar)
             .animation(.easeInOut(duration: 0.2), value: addReminder)
+            .padding(.bottom, 24)
+            } // ScrollView
             .background(theme.backgroundPrimary.ignoresSafeArea())
             .navigationTitle("Moment festhalten")
             .navigationBarTitleDisplayMode(.inline)