diff --git a/.changeset/clever-paws-rush.md b/.changeset/clever-paws-rush.md
new file mode 100644
index 00000000..2a472f62
--- /dev/null
+++ b/.changeset/clever-paws-rush.md
@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+fix: input does not overlap with language select button anymore
diff --git a/packages/app/src/AutocompleteInput.tsx b/packages/app/src/AutocompleteInput.tsx
index 9b192b4f..7ba6407f 100644
--- a/packages/app/src/AutocompleteInput.tsx
+++ b/packages/app/src/AutocompleteInput.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import Fuse from 'fuse.js';
 import { OverlayTrigger } from 'react-bootstrap';
 import { TextInput } from '@mantine/core';
@@ -83,6 +83,7 @@ export default function AutocompleteInput({
     onChange(newValue);
     inputRef.current?.focus();
   };
+  const ref = useRef<HTMLDivElement>(null);
 
   return (
     <OverlayTrigger
@@ -234,9 +235,9 @@ export default function AutocompleteInput({
             }
           }
         }}
-        rightSectionWidth="auto"
+        rightSectionWidth={ref.current?.clientWidth ?? 'auto'}
         rightSection={
-          <>
+          <div ref={ref}>
             {language != null && onLanguageChange != null && (
               <InputLanguageSwitch
                 showHotkey={showHotkey && isSearchInputFocused}
@@ -244,7 +245,7 @@ export default function AutocompleteInput({
                 onLanguageChange={onLanguageChange}
               />
             )}
-          </>
+          </div>
         }
       />
     </OverlayTrigger>
diff --git a/packages/app/src/components/InputLanguageSwitch.tsx b/packages/app/src/components/InputLanguageSwitch.tsx
index a7b17d34..06f556df 100644
--- a/packages/app/src/components/InputLanguageSwitch.tsx
+++ b/packages/app/src/components/InputLanguageSwitch.tsx
@@ -10,7 +10,7 @@ export default function InputLanguageSwitch({
   showHotkey?: boolean;
 }) {
   return (
-    <Flex wrap="nowrap" gap="xxxs" pe="sm">
+    <Flex wrap="nowrap" gap="xxxs" px="sm">
       {showHotkey && (
         <Text c="gray.3" size="xxs" bg="gray.8" px={4} py={0} mr={4} lh={1.4}>
           /