diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
index eb8bd811..68cd45bc 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
@@ -332,12 +332,24 @@ update flags msg model =
                 names =
                     List.map .name list.items
 
+                defaultConn =
+                    case names of
+                        h :: [] ->
+                            Just h
+
+                        _ ->
+                            Nothing
+
                 cm =
                     Comp.Dropdown.makeSingleList
                         { makeOption = \a -> { value = a, text = a, additional = "" }
                         , placeholder = "Select Connection..."
                         , options = names
-                        , selected = List.head names
+                        , selected =
+                            Util.Maybe.or
+                                [ List.head (Comp.Dropdown.getSelected model.connectionModel)
+                                , defaultConn
+                                ]
                         }
             in
             ( { model