diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index a7ba92fa..24917d3c 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -9,7 +9,7 @@ def home
     @upcoming_leaves = current_user.leaves.future.not_rejected.chronologic
     sprint_feedback = current_user.sprint_feedbacks.find_by(sprint: @sprint) if @sprint
     @daily_nerd_message = DailyNerdMessage.find_by(created_at: Time.zone.today.all_day, sprint_feedback:) || sprint_feedback.daily_nerd_messages.build if sprint_feedback
-    @needs_retro = current_user.sprint_feedbacks.sprint_past.retro_missing.first
+    @needs_retro_for = SprintFeedback.where(user: current_user).sprint_past.reverse_chronologic.limit(2).find { !_1.retro_completed? }
   end
 
   def offline
diff --git a/app/controllers/sprint_feedbacks_controller.rb b/app/controllers/sprint_feedbacks_controller.rb
index ccfe669b..dd006eee 100644
--- a/app/controllers/sprint_feedbacks_controller.rb
+++ b/app/controllers/sprint_feedbacks_controller.rb
@@ -14,17 +14,11 @@ def create
     ui.replace feedback.sprint
   end
 
-  def edit
+  def edit_retro
   end
 
-  def update
-    if @feedback.update feedback_update_attributes
-      @user = @feedback.user
-      ui.close_popover
-      ui.replace @feedback.sprint
-    else
-      render :edit, status: :unprocessable_entity
-    end
+  def update_retro
+    @feedback.update! feedback_update_attributes
   end
 
   def destroy
diff --git a/app/frontend/components/checkbox/checkbox.scss b/app/frontend/components/checkbox/checkbox.scss
new file mode 100644
index 00000000..7f2da4ed
--- /dev/null
+++ b/app/frontend/components/checkbox/checkbox.scss
@@ -0,0 +1,15 @@
+.checkbox {
+  &__input {
+    display: block;
+    width: 20px;
+    height: 20px;
+    border: 1px solid currentColor;
+
+    &:checked::before {
+      display: block;
+      content: 'X';
+      width: 10px;
+      height: 10px;
+    }
+  }
+}
diff --git a/app/frontend/components/checkbox/checkbox.tsx b/app/frontend/components/checkbox/checkbox.tsx
new file mode 100644
index 00000000..77811db9
--- /dev/null
+++ b/app/frontend/components/checkbox/checkbox.tsx
@@ -0,0 +1,92 @@
+import React, { ReactNode } from 'react';
+
+import { Text } from '../text/text';
+import { FormField, useInputId } from '../form_field/form_field';
+import classnames from 'classnames';
+import './checkbox.scss';
+
+interface Props extends FormField<boolean> {
+  label?: ReactNode;
+}
+
+export function Checkbox({
+  name,
+  value,
+  ariaLabel,
+  placeholder,
+  required,
+  disabled,
+  readOnly,
+  inputId,
+  label,
+  touched,
+  errors,
+  onChange,
+  onBlur,
+  onFocus,
+}: Props): JSX.Element {
+  inputId = useInputId(inputId);
+  return (
+    <div className="checkbox__container">
+      <div
+        className={classnames(
+          'checkbox',
+          {
+            'checkbox--filled': !!value,
+            'checkbox--readonly': readOnly,
+            'checkbox--disabled': disabled,
+            'checkbox--placeholder': placeholder,
+          },
+          { disabled }
+        )}
+      >
+        <div className="checkbox__content">
+          {label !== undefined && (
+            <label
+              className={classnames('checkbox__label', {
+                'checkbox__label--disabled': disabled,
+              })}
+              htmlFor={inputId}
+            >
+              {label}
+            </label>
+          )}
+          <Text>
+            <input
+              id={inputId}
+              name={name}
+              className={classnames('checkbox__input')}
+              readOnly={readOnly}
+              checked={value}
+              type="checkbox"
+              onChange={(event) => {
+                if (readOnly) {
+                  event.preventDefault();
+                  return;
+                }
+                onChange?.(event.target.checked);
+              }}
+              onFocus={() => {
+                onFocus?.();
+              }}
+              onBlur={() => {
+                onBlur?.();
+              }}
+              placeholder={placeholder}
+              required={required}
+              disabled={disabled}
+              aria-label={ariaLabel}
+            />
+          </Text>
+        </div>
+        {touched && errors && (
+          <div className="checkbox__errors">
+            {errors.map((error) => (
+              <Text key={error}>{error}</Text>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/app/frontend/components/number_field/number_field.tsx b/app/frontend/components/number_field/number_field.tsx
index 68c54e58..ecb8fac4 100644
--- a/app/frontend/components/number_field/number_field.tsx
+++ b/app/frontend/components/number_field/number_field.tsx
@@ -12,7 +12,7 @@ export function NumberField(props: Props): JSX.Element {
     <TextField
       {...props}
       value={props.value.toString()}
-      onChange={(value) => Number(value)}
+      onChange={(value) => props.onChange?.(Number(value))}
     />
   );
 }
diff --git a/app/frontend/locale/en.json b/app/frontend/locale/en.json
index 71712b63..efa15494 100644
--- a/app/frontend/locale/en.json
+++ b/app/frontend/locale/en.json
@@ -6,7 +6,10 @@
       "last_payments": "Last payments",
       "remaining_holidays": "Remaining holidays",
       "number_holidays_left": "You have %{count} days off left",
-      "payslip_archive": "archive"
+      "payslip_archive": "archive",
+      "missing_retro": "Retrospective Notes Missing",
+      "missing_retro_description": "You did not yet leave a rating for sprint %{title}.",
+      "leave_retro_notes": "Rate the sprint now"
     }
   },
   "sprints": {
@@ -18,6 +21,14 @@
       "save": "Save"
     }
   },
+  "sprint_feedbacks": {
+    "edit_retro": {
+      "skip": "Skip rating this sprint",
+      "rating": "Rating",
+      "text": "Text",
+      "save": "Save"
+    }
+  },
   "users": {
     "index": {
       "title": "Users",
diff --git a/app/models/sprint_feedback.rb b/app/models/sprint_feedback.rb
index 83af367c..0e1f9781 100644
--- a/app/models/sprint_feedback.rb
+++ b/app/models/sprint_feedback.rb
@@ -30,6 +30,7 @@ class SprintFeedback < ApplicationRecord
   validates :retro_rating, numericality: {only_integer: true, in: 1..5}, allow_nil: true
 
   scope :ordered, -> { joins(:user).order("users.email ASC") }
+  scope :reverse_chronologic, -> { joins(:sprint).order("LOWER(sprints.sprint_during) DESC") }
   scope :retro_missing, -> { where(retro_rating: nil, skip_retro: false) }
   scope :retro_not_skipped, -> { where(skip_retro: false) }
   scope :sprint_past, -> {
diff --git a/app/policies/sprint_feedback_policy.rb b/app/policies/sprint_feedback_policy.rb
index a84a07e7..b24d1737 100644
--- a/app/policies/sprint_feedback_policy.rb
+++ b/app/policies/sprint_feedback_policy.rb
@@ -9,6 +9,14 @@ def create?
     hr?
   end
 
+  def edit_retro?
+    update?
+  end
+
+  def update_retro?
+    update?
+  end
+
   def update?
     hr? || record.user == user
   end
diff --git a/app/views/pages/_daily_nerd_card.tsx b/app/views/pages/_daily_nerd_card.tsx
index 6f66e4a0..1d8a911a 100644
--- a/app/views/pages/_daily_nerd_card.tsx
+++ b/app/views/pages/_daily_nerd_card.tsx
@@ -33,16 +33,24 @@ export function DailyNerdCard({ id, message }: Props): JSX.Element {
     },
   });
   return (
-    <Card title="Daily Nerd" icon="📝">
-      <TextArea
-        {...fields.message}
-        label="Message"
-        placeholder="How was your day? What did you learn?"
-      />
-      <Button
-        title={id ? 'Update daily nerd message' : 'Create daily nerd message'}
-        onClick={onSubmit}
-      />
-    </Card>
+    <Card
+      title="Daily Nerd"
+      icon="📝"
+      subtitle={
+        <>
+          <TextArea
+            {...fields.message}
+            label="Message"
+            placeholder="How was your day? What did you learn?"
+          />
+          <Button
+            title={
+              id ? 'Update daily nerd message' : 'Create daily nerd message'
+            }
+            onClick={onSubmit}
+          />
+        </>
+      }
+    />
   );
 }
diff --git a/app/views/pages/home.props.rb b/app/views/pages/home.props.rb
index c8ad8024..548829d5 100644
--- a/app/views/pages/home.props.rb
+++ b/app/views/pages/home.props.rb
@@ -21,3 +21,8 @@
   field :id, null: true
   field :message, null: true
 end
+
+field :needs_retro_for, null: true, value: -> { @needs_retro_for } do
+  field :id
+  field :title, value: -> { sprint.title }
+end
diff --git a/app/views/pages/home.tsx b/app/views/pages/home.tsx
index 54c59660..00c82672 100644
--- a/app/views/pages/home.tsx
+++ b/app/views/pages/home.tsx
@@ -16,6 +16,7 @@ export default function Home({
     payslips,
     remainingHolidays,
     dailyNerdMessage,
+    needsRetroFor,
   },
 }: PageProps<'pages/home'>): JSX.Element {
   const t = useTranslate();
@@ -26,8 +27,24 @@ export default function Home({
         <Text type="headline">
           {t('pages.home.hello', { name: currentUser.displayName })}
         </Text>
-        {dailyNerdMessage && <DailyNerdCard {...dailyNerdMessage} />}
         <Columns>
+          {needsRetroFor && (
+            <Card
+              icon="🚀"
+              title={t('pages.home.missing_retro')}
+              subtitle={
+                <Stack>
+                  {t('pages.home.missing_retro_description', {
+                    title: needsRetroFor.title,
+                  })}
+                  <Link href={`/en/sprint_feedbacks/${needsRetroFor.id}`}>
+                    {t('pages.home.leave_retro_notes')}
+                  </Link>
+                </Stack>
+              }
+            />
+          )}
+          {dailyNerdMessage && <DailyNerdCard {...dailyNerdMessage} />}
           {upcomingLeaves.length > 0 && (
             <Card
               icon="🏝️"
diff --git a/app/views/sprint_feedbacks/edit_retro.props.rb b/app/views/sprint_feedbacks/edit_retro.props.rb
new file mode 100644
index 00000000..4218a436
--- /dev/null
+++ b/app/views/sprint_feedbacks/edit_retro.props.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+render "components/current_user"
+
+field :feedback, value: -> { @feedback } do
+  field :id
+  field :retro_rating, Integer, null: true
+  field :retro_text, null: true
+  field :skip_retro, Boolean
+end
diff --git a/app/views/sprint_feedbacks/edit_retro.tsx b/app/views/sprint_feedbacks/edit_retro.tsx
new file mode 100644
index 00000000..a376ad6e
--- /dev/null
+++ b/app/views/sprint_feedbacks/edit_retro.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { PageProps } from '../../../data.d';
+import { useTranslate } from '../../frontend/util/dependencies';
+import { Stack } from '../../frontend/components/stack/stack';
+import { Button } from '../../frontend/components/button/button';
+import { useForm } from '@nerdgeschoss/react-use-form-library';
+import { TextField } from '../../frontend/components/text_field/text_field';
+import { useReaction } from '../../frontend/sprinkles/reaction';
+import { useModalInfo } from '../../frontend/components/modal/modal';
+import { NumberField } from '../../frontend/components/number_field/number_field';
+import { Checkbox } from '../../frontend/components/checkbox/checkbox';
+
+export default function ({
+  data: { feedback },
+}: PageProps<'sprint_feedbacks/edit_retro'>): JSX.Element {
+  const t = useTranslate();
+  const reaction = useReaction();
+  const modal = useModalInfo();
+  const { fields, valid, onSubmit } = useForm({
+    model: {
+      retroRating: feedback.retroRating ?? 5,
+      retroText: feedback.retroText ?? '',
+      skipRetro: feedback.skipRetro,
+    },
+    validations: {
+      retroRating: ({ model }) =>
+        model.skipRetro || model.retroRating ? [] : ['required'],
+      retroText: ({ model }) =>
+        model.skipRetro || model.retroText ? [] : ['required'],
+    },
+    onSubmit: async ({ model }) => {
+      const sprint_feedback = model.skipRetro
+        ? { skipRetro: true, retroText: null, retroRating: null }
+        : {
+            skipRetro: false,
+            retroText: model.retroText,
+            retroRating: model.retroRating,
+          };
+      await reaction.call({
+        path: `/sprint_feedbacks/${feedback.id}/update_retro`,
+        method: 'POST',
+        params: { sprint_feedback },
+        refresh: true,
+      });
+      modal.close();
+    },
+  });
+
+  return (
+    <Stack>
+      <Checkbox
+        {...fields.skipRetro}
+        label={t('sprint_feedbacks.edit_retro.skip')}
+      />
+      {!fields.skipRetro.value && (
+        <>
+          <NumberField
+            {...fields.retroRating}
+            label={t('sprint_feedbacks.edit_retro.rating')}
+          />
+          <TextField
+            {...fields.retroText}
+            label={t('sprint_feedbacks.edit_retro.text')}
+          />
+        </>
+      )}
+      <Button
+        title={t('sprint_feedbacks.edit_retro.save')}
+        disabled={!valid}
+        onClick={onSubmit}
+      />
+    </Stack>
+  );
+}
diff --git a/app/views/sprint_feedbacks/show.props.rb b/app/views/sprint_feedbacks/show.props.rb
index 72598e1e..080557c3 100644
--- a/app/views/sprint_feedbacks/show.props.rb
+++ b/app/views/sprint_feedbacks/show.props.rb
@@ -12,6 +12,8 @@
   field :tracked_hours, Float
   field :billable_hours, Float
 
+  field :permit_edit_retro_notes, Boolean, value: -> { helpers.policy(self).update? }
+
   field :sprint do
     field :id
     field :title
diff --git a/app/views/sprint_feedbacks/show.tsx b/app/views/sprint_feedbacks/show.tsx
index 6d48b2d8..dda49248 100644
--- a/app/views/sprint_feedbacks/show.tsx
+++ b/app/views/sprint_feedbacks/show.tsx
@@ -5,12 +5,15 @@ import { Layout } from '../../frontend/components/layout/layout';
 import { Stack } from '../../frontend/components/stack/stack';
 import { Card } from '../../frontend/components/card/card';
 import { Text } from '../../frontend/components/text/text';
+import { useModal } from '../../frontend/components/modal/modal';
+import { Button } from '../../frontend/components/button/button';
 
 export default function ({
   data: { currentUser, feedback },
 }: PageProps<'sprint_feedbacks/show'>): JSX.Element {
   const l = useFormatter();
   const hourGoal = feedback.workingDayCount * 7.5;
+  const modal = useModal();
 
   return (
     <Layout user={currentUser} container>
@@ -68,6 +71,16 @@ export default function ({
                 <Text>⭐ Retrospective</Text>
                 <Text>{feedback.retroRating}/5</Text>
                 <Text multiline>{feedback.retroText}</Text>
+                {feedback.permitEditRetroNotes && (
+                  <Button
+                    title="leave feedback"
+                    onClick={() =>
+                      modal.present(
+                        `/en/sprint_feedbacks/${feedback.id}/edit_retro`
+                      )
+                    }
+                  />
+                )}
               </Stack>
             </Stack>
             {feedback.days.map((day) => (
@@ -77,32 +90,34 @@ export default function ({
                 subtitle={l.date(day.day)}
               >
                 <Stack>
-                  <table className="table">
-                    <thead>
-                      <tr>
-                        <td>Note</td>
-                        <td>Task</td>
-                        <td>Project</td>
-                        <td>Tracked</td>
-                        <td>Status</td>
-                        <td>Members</td>
-                        <td>Total Hours</td>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {day.timeEntries.map((timeEntry) => (
-                        <tr key={timeEntry.id}>
-                          <td>{timeEntry.notes}</td>
-                          <td>{timeEntry.type}</td>
-                          <td>{timeEntry.project?.name}</td>
-                          <td>{timeEntry.hours}</td>
-                          <td>{timeEntry.task?.status}</td>
-                          <td></td>
-                          <td>{timeEntry.task?.totalHours}</td>
+                  {day.timeEntries.length > 0 && (
+                    <table className="table">
+                      <thead>
+                        <tr>
+                          <td>Note</td>
+                          <td>Task</td>
+                          <td>Project</td>
+                          <td>Tracked</td>
+                          <td>Status</td>
+                          <td>Members</td>
+                          <td>Total Hours</td>
                         </tr>
-                      ))}
-                    </tbody>
-                  </table>
+                      </thead>
+                      <tbody>
+                        {day.timeEntries.map((timeEntry) => (
+                          <tr key={timeEntry.id}>
+                            <td>{timeEntry.notes}</td>
+                            <td>{timeEntry.type}</td>
+                            <td>{timeEntry.project?.name}</td>
+                            <td>{timeEntry.hours}</td>
+                            <td>{timeEntry.task?.status}</td>
+                            <td></td>
+                            <td>{timeEntry.task?.totalHours}</td>
+                          </tr>
+                        ))}
+                      </tbody>
+                    </table>
+                  )}
                   {day.dailyNerdMessage && (
                     <Text multiline>{day.dailyNerdMessage.message}</Text>
                   )}
diff --git a/config/routes.rb b/config/routes.rb
index f9444fb3..500b16e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,7 +12,10 @@
     resources :payslips
     resources :leaves
     resources :sprints
-    resources :sprint_feedbacks
+    resources :sprint_feedbacks do
+      get "edit_retro", on: :member
+      post "update_retro", on: :member
+    end
     resources :users do
       get :unpaid_vacation, on: :member
       resources :inventories, only: :new
diff --git a/data.d.ts b/data.d.ts
index 9b694e2b..fcbbe67d 100644
--- a/data.d.ts
+++ b/data.d.ts
@@ -73,6 +73,10 @@ export interface DataSchema {
       id: string | null;
       message: string | null;
     } | null;
+    needsRetroFor: {
+      id: string;
+      title: string;
+    } | null;
   };
   'payslips/index': {
     currentUser: {
@@ -98,6 +102,19 @@ export interface DataSchema {
   };
   'sessions/edit': { email: string };
   'sessions/new': {};
+  'sprint_feedbacks/edit_retro': {
+    currentUser: {
+      id: string;
+      displayName: string;
+      avatarUrl: string;
+    };
+    feedback: {
+      id: string;
+      retroRating: number | null;
+      retroText: string | null;
+      skipRetro: boolean;
+    };
+  };
   'sprint_feedbacks/show': {
     currentUser: {
       id: string;
@@ -113,6 +130,7 @@ export interface DataSchema {
       workingDayCount: number;
       trackedHours: number;
       billableHours: number;
+      permitEditRetroNotes: boolean;
       sprint: {
         id: string;
         title: string;
diff --git a/spec/system/retrospective_spec.rb b/spec/system/retrospective_spec.rb
new file mode 100644
index 00000000..4ef02d74
--- /dev/null
+++ b/spec/system/retrospective_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "system_helper"
+
+RSpec.describe "Retrospectives" do
+  fixtures :all
+  let(:user) { users(:john) }
+  let(:sprint) { Sprint.create!(title: "Sprint 1", sprint_from: 2.weeks.ago, sprint_until: 1.week.ago) }
+  let(:feedback) { sprint.sprint_feedbacks.create!(user:) }
+
+  before do
+    travel_to "2018-02-05"
+    login user
+  end
+
+  it "shows a reminder on the home page when the feedback for last sprint was not filled out" do
+    feedback
+    visit root_path
+    expect(page).to have_content "Retrospective Notes Missing"
+
+    feedback.update! retro_text: "I'm happy", retro_rating: 5
+    visit root_path
+    expect(page).not_to have_content "Retrospective Notes Missing"
+  end
+
+  it "shows the feedback form on the sprints page" do
+    visit sprint_feedback_path(feedback)
+    click_on "leave feedback"
+
+    fill_in "Rating", with: "4"
+    fill_in "Text", with: "I'm happy"
+    click_on "Save"
+
+    expect(page).not_to have_selector ".modal"
+
+    expect(page).to have_content "4/5"
+    expect(page).to have_content "I'm happy"
+  end
+
+  it "allows skipping the retro" do
+    visit sprint_feedback_path(feedback)
+    click_on "leave feedback"
+
+    check "Skip rating this sprint"
+    click_on "Save"
+
+    expect(page).to have_content "/5"
+  end
+end
diff --git a/spec/system/sprint_feedbacks_spec.rb b/spec/system/sprint_feedbacks_spec.rb
deleted file mode 100644
index d4b1c5ca..00000000
--- a/spec/system/sprint_feedbacks_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require "system_helper"
-
-RSpec.describe "Sprint Feedback" do
-  fixtures :all
-
-  before do
-    travel_to "2023-02-05"
-    login :john
-  end
-
-  it "shows a reminder on the home page when the feedback for last sprint was not filled out" do
-    visit root_path
-    expect(page).to have_content "Missing Sprint Feedback"
-  end
-
-  it "shows the feedback form on the sprints page" do
-    visit sprints_path
-    expect(page).to have_content "Please write your feedback"
-
-    fill_in "Retro text", with: "I'm happy"
-    find("[title='5 / 5']").choose
-    click_button
-    expect(page).to have_content "John rated: 5"
-    expect(page).to have_content "I'm happy"
-
-    visit root_path
-    expect(page).not_to have_content "Missing Sprint Feedback"
-  end
-
-  it "allows editing the retro feedback" do
-    feedback = sprint_feedbacks(:sprint_feedback_john)
-    feedback.update!(retro_text: "I'm happy!", retro_rating: 5)
-    visit sprints_path
-
-    click_button("Edit")
-    fill_in "Retro text", with: "I'm okay-ish"
-    find("[title='3 / 5']").choose
-    click_button("Update")
-
-    expect(page).to have_content "John rated: 3"
-    expect(page).to have_content "I'm okay-ish"
-  end
-
-  it "allows skipping the retro" do
-    visit sprints_path
-
-    check("Skip retro")
-    click_button("Update")
-
-    expect(page).to have_content "John skipped"
-  end
-end