diff --git a/TablePro/Views/Connection/ConnectionFormView.swift b/TablePro/Views/Connection/ConnectionFormView.swift
index 8e6583d1..45c41260 100644
--- a/TablePro/Views/Connection/ConnectionFormView.swift
+++ b/TablePro/Views/Connection/ConnectionFormView.swift
@@ -161,16 +161,16 @@ struct ConnectionFormView: View { // swiftlint:disable:this type_body_length
         .onChange(of: type) { _, newType in
             if hasLoadedData {
                 port = String(newType.defaultPort)
+                additionalFieldValues = [:]
+                for field in PluginManager.shared.additionalConnectionFields(for: newType) {
+                    if let defaultValue = field.defaultValue {
+                        additionalFieldValues[field.id] = defaultValue
+                    }
+                }
             }
             if !visibleTabs.contains(selectedTab) {
                 selectedTab = .general
             }
-            additionalFieldValues = [:]
-            for field in PluginManager.shared.additionalConnectionFields(for: newType) {
-                if let defaultValue = field.defaultValue {
-                    additionalFieldValues[field.id] = defaultValue
-                }
-            }
         }
         .pluginInstallPrompt(connection: $pluginInstallConnection) { connection in
             connectAfterInstall(connection)