diff --git a/client/cmd/install.go b/client/cmd/install.go
index 7030d42..06d1c8f 100644
--- a/client/cmd/install.go
+++ b/client/cmd/install.go
@@ -569,13 +569,13 @@ func setup(userSecret string, isOffline bool) error {
 	}
 	fmt.Println("Setting secret hishtory key to " + string(userSecret))
 
-	// Create and set the config
+	// Create and set the config with the defaults that we want for new installs
 	var config hctx.ClientConfig
 	config.UserSecret = userSecret
 	config.IsEnabled = true
 	config.DeviceId = uuid.Must(uuid.NewRandom()).String()
 	config.ControlRSearchEnabled = true
-	// TODO: Set config.HighlightMatches = true here, so that we enable highlighting by default
+	config.HighlightMatches = true
 	config.AiCompletion = true
 	config.IsOffline = isOffline
 	config.EnablePresaving = true