diff --git a/code/frontend/MakeItSo/Shared/Features/ReminderList/ViewModels/RemindersListViewModel.swift b/code/frontend/MakeItSo/Shared/Features/ReminderList/ViewModels/RemindersListViewModel.swift
index 68f19de45..2ff5f0b52 100644
--- a/code/frontend/MakeItSo/Shared/Features/ReminderList/ViewModels/RemindersListViewModel.swift
+++ b/code/frontend/MakeItSo/Shared/Features/ReminderList/ViewModels/RemindersListViewModel.swift
@@ -179,6 +179,10 @@ class RemindersListViewModel: ObservableObject {
     }
   }
   
+  func unfocus() {
+    self.focusedReminder = nil
+  }
+  
 }
 
 
diff --git a/code/frontend/MakeItSo/Shared/Features/ReminderList/Views/RemindersListView.swift b/code/frontend/MakeItSo/Shared/Features/ReminderList/Views/RemindersListView.swift
index f89bbdbbf..3130e72fc 100644
--- a/code/frontend/MakeItSo/Shared/Features/ReminderList/Views/RemindersListView.swift
+++ b/code/frontend/MakeItSo/Shared/Features/ReminderList/Views/RemindersListView.swift
@@ -67,6 +67,13 @@ struct RemindersListView: View {
       }
     }
     .toolbar {
+      ToolbarItem(placement: .navigationBarTrailing) {
+        if focusedReminder != nil {
+          Button(action: viewModel.unfocus ) {
+            Text("Done")
+          }
+        }
+      }
       ToolbarItemGroup(placement: .bottomBar) {
         Button(action: { viewModel.createNewReminder() }) {
           HStack {