diff --git a/ShhShell/Terminal/SSHTerminalDelegate.swift b/ShhShell/Terminal/SSHTerminalDelegate.swift
index d92a60d..24af308 100644
--- a/ShhShell/Terminal/SSHTerminalDelegate.swift
+++ b/ShhShell/Terminal/SSHTerminalDelegate.swift
@@ -135,10 +135,9 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
 		getTerminal().foregroundColor = theme.foreground
 		getTerminal().backgroundColor = theme.background
 		
-		caretColor = theme.cursor.uiColor
+		setCursorColor(source: getTerminal(), color: theme.cursor, textColor: theme.cursorText)
 		selectedTextBackgroundColor = theme.selection.uiColor
-		
-		// TODO: selectedtext and cursor colors
+		// TODO: selectedtext color
 	}
 	
 	func applyScrollbackLength() {
diff --git a/ShhShell/Views/Terminal/ShellTabView.swift b/ShhShell/Views/Terminal/ShellTabView.swift
index c75f24f..3637106 100644
--- a/ShhShell/Views/Terminal/ShellTabView.swift
+++ b/ShhShell/Views/Terminal/ShellTabView.swift
@@ -124,7 +124,7 @@ struct ShellTabView: View {
 						let oneTabWidth: CGFloat = max(100, (UIScreen.main.bounds.width)/CGFloat(container.sessionIDs.count))
 						HStack(spacing: 0) {
 							ForEach(container.sessionIDs, id: \.self) { id in
-								let selected: Bool = selectedID == id
+								let selected: Bool = selectedID == id || (selectedID == nil && handler.sessionID == id)
 								let thisHandler: SSHHandler = container.sessions[id]!.handler
 								ZStack {
 									Rectangle()