diff --git a/ShhShell/Host/HostsManager.swift b/ShhShell/Host/HostsManager.swift
index df4484b..1bbbe67 100644
--- a/ShhShell/Host/HostsManager.swift
+++ b/ShhShell/Host/HostsManager.swift
@@ -44,7 +44,7 @@ class HostsManager: ObservableObject, @unchecked Sendable {
 		self.fonts = customFonts
 		
 		userDefaults.synchronize()
-		self.selectedFont = userDefaults.string(forKey: "selectedFontName") ?? "Menlo"
+		self.selectedFont = userDefaults.string(forKey: "selectedFontName") ?? "SF Mono"
 		self.fontSize = CGFloat(userDefaults.double(forKey: "fontSize"))
 	}
 	
diff --git a/ShhShell/Views/Misc/TextBox.swift b/ShhShell/Views/Misc/TextBox.swift
index a150471..d4acec9 100644
--- a/ShhShell/Views/Misc/TextBox.swift
+++ b/ShhShell/Views/Misc/TextBox.swift
@@ -23,6 +23,7 @@ struct TextBox: View {
 			} else {
 				TextField("", text: $text, prompt: Text(prompt))
 					.multilineTextAlignment(.trailing)
+					.disableAutocorrection(true)
 			}
 		}
     }
diff --git a/ShhShell/Views/Terminal/SSHTerminalDelegate.swift b/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
index 23c3300..ab7fc0e 100644
--- a/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
+++ b/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
@@ -25,7 +25,7 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
 		if window != nil {
 			restoreScrollback()
 			if let hostsManager {
-//				font = UIFont(name: hostsManager.selectedFont, size: hostsManager.fontSize)!
+				font = UIFont(name: hostsManager.selectedFont, size: hostsManager.fontSize)!
 			}
 			applySelectedTheme()
 			startFeedLoop()