diff --git a/packages/ui/src/Switch.ts b/packages/ui/src/Switch.ts
index 7c24941a5..d9a1e01d0 100644
--- a/packages/ui/src/Switch.ts
+++ b/packages/ui/src/Switch.ts
@@ -114,7 +114,7 @@ export class Switch extends Widget {
         if (width <= 0) return;
 
         const attrs = styleToCellAttrs(this.style);
-        const knobPos = Math.round(this._animProgress * 2);
+        const knobPos = Math.round(this._animProgress * 2 + Number.EPSILON);
         const transitioning = this._animProgress > 0 && this._animProgress < 1;
 
         let trackChars: string[];
diff --git a/packages/ui/src/TreeSelect.ts b/packages/ui/src/TreeSelect.ts
index 652ede256..2c3a59a97 100644
--- a/packages/ui/src/TreeSelect.ts
+++ b/packages/ui/src/TreeSelect.ts
@@ -182,7 +182,7 @@ function _pathsEqual(a: number[], b: number[]): boolean {
 
 function _valuesEqual(a: string[], b: string[]): boolean {
     if (a.length !== b.length) return false;
-    const sortedA = [...a].sort();
+    const sortedA = [...a].sort((a, b) => a - b);
     const sortedB = [...b].sort();
     for (let i = 0; i < sortedA.length; i++) {
         if (sortedA[i] !== sortedB[i]) return false;
diff --git a/packages/ui/src/prompts.ts b/packages/ui/src/prompts.ts
index b92bb28ba..b248a6ac4 100644
--- a/packages/ui/src/prompts.ts
+++ b/packages/ui/src/prompts.ts
@@ -113,7 +113,7 @@ async function promptSelect<T = string>(options: SelectPromptOptions<T>): Promis
                     return;
                 }
                 const n = parseInt(trimmed, 10);
-                if (!isNaN(n) && n >= 1 && n <= choices.length) {
+                if (!Number.isNaN(n) && n >= 1 && n <= choices.length) {
                     rl.close();
                     resolve(choices[n - 1].value);
                     return;