diff --git a/Loop/Views/BolusEntryView.swift b/Loop/Views/BolusEntryView.swift
index ab2e6d3f7..fecd2365c 100644
--- a/Loop/Views/BolusEntryView.swift
+++ b/Loop/Views/BolusEntryView.swift
@@ -248,7 +248,11 @@ struct BolusEntryView: View {
                     .multilineTextAlignment(.trailing)
                     .foregroundColor(.loopAccent)
                     .focused($bolusFieldFocused)
-                    .onTapGesture { didBeginEditing() }
+                    .onChange(of: bolusFieldFocused) { focused in
+                        if focused {
+                            didBeginEditing()
+                        }
+                    }
                     .onChange(of: enteredBolusString) { newValue in
                         if newValue.count > 5 {
                             enteredBolusString = String(newValue.prefix(5))