diff --git a/client/src/App.css b/client/src/App.css
index 49da2d8..89e8abe 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -2719,6 +2719,9 @@ html.theme-cupertino .events-scroll-container {
 
 /* Event Editor Interactive Sails Picker */
 .sails-picker-container {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
   grid-column: 1 / -1;
   margin-top: -4px;
 }
diff --git a/client/src/components/LogEntryEditor.tsx b/client/src/components/LogEntryEditor.tsx
index 1bb7164..0213a5c 100644
--- a/client/src/components/LogEntryEditor.tsx
+++ b/client/src/components/LogEntryEditor.tsx
@@ -897,6 +897,7 @@ export default function LogEntryEditor({
     setEvRemarks('')
     setEvLocationName('')
     setEditingEventIndex(null)
+    setSailsPickerExpanded(false)
   }
 
   const fillEventForm = (ev: LogEvent) => {