diff --git a/WordAX/Model/Flashcard/Flashcard+CoreDataClass.swift b/WordAX/Model/Flashcard/Flashcard+CoreDataClass.swift
index b650601..6edf95e 100644
--- a/WordAX/Model/Flashcard/Flashcard+CoreDataClass.swift
+++ b/WordAX/Model/Flashcard/Flashcard+CoreDataClass.swift
@@ -48,6 +48,7 @@ public class Flashcard: NSManagedObject {
     }
     
     func getSpacedRepetitionMilestone() -> SpacedRepetitionMilestoneEnum {
-        SpacedRepetitionMilestoneEnum.getMilestoneFromInt(value: self.nextSpacedRepetitionMilestone)
+        var milestone = SpacedRepetitionMilestoneEnum.getMilestoneFromInt(value: self.nextSpacedRepetitionMilestone)
+        return milestone == .Now ? .TenMinutes : milestone
     }
 }
diff --git a/WordAX/Views/Deck/DeckSelectView.swift b/WordAX/Views/Deck/DeckSelectView.swift
index 1dff5e3..144d8e9 100644
--- a/WordAX/Views/Deck/DeckSelectView.swift
+++ b/WordAX/Views/Deck/DeckSelectView.swift
@@ -13,17 +13,10 @@ struct DeckSelectView: View {
     @Binding var active: Bool
     var body: some View {
         NavigationStack {
-            List(decks) { deck in
-                DeckRowView(deck: deck, selected: selection.contains(deck))
-                    .contentShape(Rectangle())
-                    .onTapGesture {
-                        if !selection.contains(deck) {
-                            self.selection.insert(deck)
-                        } else {
-                            self.selection.remove(deck)
-                        }
-                    }
+            List(decks, id:\.self, selection: $selection) { deck in
+                DeckRowView(deck: deck)
             }
+            .environment(\.editMode, .constant(EditMode.active))
             .toolbar {
                 ToolbarItemGroup(placement: .topBarTrailing) {
                     Button(action: {