diff --git a/tools/tui/graphics/command.go b/tools/tui/graphics/command.go
index eef28cfa5..fb2e485fa 100644
--- a/tools/tui/graphics/command.go
+++ b/tools/tui/graphics/command.go
@@ -5,12 +5,13 @@ package graphics
 import (
 	"bytes"
 	"compress/zlib"
-	"encoding/base64"
 	"fmt"
 	"io"
 	"strconv"
 	"strings"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 	"github.com/kovidgoyal/kitty/tools/utils"
diff --git a/tools/utils/streaming_base64/api_test.go b/tools/utils/streaming_base64/api_test.go
index f452640ee..3f4c7b47a 100644
--- a/tools/utils/streaming_base64/api_test.go
+++ b/tools/utils/streaming_base64/api_test.go
@@ -19,10 +19,7 @@ func collectDecode(t *testing.T, d *StreamingBase64Decoder, encoded []byte, chun
 	t.Helper()
 	var result []byte
 	for len(encoded) > 0 {
-		end := chunkSize
-		if end > len(encoded) {
-			end = len(encoded)
-		}
+		end := min(chunkSize, len(encoded))
 		chunk := encoded[:end]
 		encoded = encoded[end:]