diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index f8c164fe..dc2a8127 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -359,7 +359,7 @@ struct UserMessageList: View {
 						.listRowSeparator(.hidden)
 					}
 				}
-				.scrollDismissesKeyboard(.interactively)
+				.scrollDismissesKeyboard(.immediately)
 				.onAppear(perform: {
 					
 					self.bleManager.context = context
diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
index 205bb957..4182c287 100644
--- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
+++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
@@ -163,7 +163,7 @@ struct MQTTConfig: View {
 				"Are you sure?",
 				isPresented: $isPresentingSaveConfirm
 			) {
-				Button("Save WiFI Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") {
+				Button("Save MQTT Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") {
 					
 					var mqtt = ModuleConfig.MQTTConfig()
 					mqtt.enabled = self.enabled