diff --git a/packages/app/src/components/code-insets.ts b/packages/app/src/components/code-insets.ts
index bcb34bf59..d8d1c2905 100644
--- a/packages/app/src/components/code-insets.ts
+++ b/packages/app/src/components/code-insets.ts
@@ -2,11 +2,14 @@ import type { Theme } from "@/styles/theme";
 
 /**
  * Compute the pixel width for a line-number gutter based on the highest
- * line number that will be displayed. Minimum width accommodates 2 digits.
+ * line number that will be displayed and the gutter font size. Minimum
+ * width accommodates 2 digits. The 0.62 factor approximates monospace
+ * digit width as a fraction of font size.
  */
-export function lineNumberGutterWidth(maxLineNumber: number): number {
+export function lineNumberGutterWidth(maxLineNumber: number, fontSize: number): number {
   const digits = Math.max(2, String(maxLineNumber).length);
-  return digits * 8 + 12;
+  const digitWidth = Math.ceil(fontSize * 0.62);
+  return digits * digitWidth + 12;
 }
 
 export function getCodeInsets(theme: Theme) {
diff --git a/packages/app/src/components/file-pane.tsx b/packages/app/src/components/file-pane.tsx
index ac5e85ced..e93f0a64c 100644
--- a/packages/app/src/components/file-pane.tsx
+++ b/packages/app/src/components/file-pane.tsx
@@ -112,7 +112,9 @@ const CodeLine = React.memo(function CodeLine({
   return (
     <View style={codeLineStyles.line}>
       <View style={gutterStyle}>
-        <Text style={gutterTextStyle}>{String(lineNumber)}</Text>
+        <Text numberOfLines={1} style={gutterTextStyle}>
+          {String(lineNumber)}
+        </Text>
       </View>
       <Text selectable style={codeLineStyles.lineText}>
         {keyedTokens.map(({ key, token }) => (
@@ -193,8 +195,8 @@ function FilePreviewBody({
 
   const gutterWidth = useMemo(() => {
     if (!highlightedLines) return 0;
-    return lineNumberGutterWidth(highlightedLines.length);
-  }, [highlightedLines]);
+    return lineNumberGutterWidth(highlightedLines.length, theme.fontSize.sm);
+  }, [highlightedLines, theme.fontSize.sm]);
 
   const imageSource = useMemo(
     () => (imagePreviewUri ? { uri: imagePreviewUri } : null),
diff --git a/packages/app/src/components/git-diff-pane.tsx b/packages/app/src/components/git-diff-pane.tsx
index 83f733e9d..9c94b80b2 100644
--- a/packages/app/src/components/git-diff-pane.tsx
+++ b/packages/app/src/components/git-diff-pane.tsx
@@ -235,7 +235,9 @@ function DiffGutterCell({
   );
   return (
     <View style={containerStyle}>
-      <Text style={textStyle}>{formatDiffGutterText(lineNumber)}</Text>
+      <Text numberOfLines={1} style={textStyle}>
+        {formatDiffGutterText(lineNumber)}
+      </Text>
     </View>
   );
 }
@@ -350,7 +352,9 @@ function DiffLineView({
   return (
     <View style={containerStyle}>
       <View style={gutterStyle}>
-        <Text style={gutterTextStyle}>{formatDiffGutterText(lineNumber)}</Text>
+        <Text numberOfLines={1} style={gutterTextStyle}>
+          {formatDiffGutterText(lineNumber)}
+        </Text>
       </View>
       {line.type !== "header" && visibleTokens ? (
         <HighlightedText tokens={visibleTokens} wrapLines={wrapLines} />
@@ -403,7 +407,9 @@ function SplitDiffLine({
   return (
     <View style={containerStyle}>
       <View style={gutterStyle}>
-        <Text style={gutterTextStyle}>{formatDiffGutterText(line?.lineNumber ?? null)}</Text>
+        <Text numberOfLines={1} style={gutterTextStyle}>
+          {formatDiffGutterText(line?.lineNumber ?? null)}
+        </Text>
       </View>
       {visibleTokens ? (
         <HighlightedText tokens={visibleTokens} wrapLines={wrapLines} />
@@ -624,6 +630,7 @@ function DiffFileBody({
 }) {
   const [scrollViewWidth, setScrollViewWidth] = useState(0);
   const [bodyWidth, setBodyWidth] = useState(0);
+  const { theme } = useUnistyles();
 
   const handleLayout = useCallback(
     (event: LayoutChangeEvent) => {
@@ -660,7 +667,7 @@ function DiffFileBody({
             hunk.newStart + hunk.newCount,
           );
         }
-        const gutterWidth = lineNumberGutterWidth(maxLineNo);
+        const gutterWidth = lineNumberGutterWidth(maxLineNo, theme.fontSize.xs);
 
         if (layout === "split") {
           const rows = buildSplitDiffRows(file);