diff --git a/web/packages/teleterm/src/ui/Search/SearchBar.tsx b/web/packages/teleterm/src/ui/Search/SearchBar.tsx
index d29d28ef40549..bd48063679f9c 100644
--- a/web/packages/teleterm/src/ui/Search/SearchBar.tsx
+++ b/web/packages/teleterm/src/ui/Search/SearchBar.tsx
@@ -140,7 +140,6 @@ function SearchBar() {
         position: relative;
         flex: 4;
         flex-shrink: 1;
-        min-width: calc(${props => props.theme.space[7]}px * 2);
         height: 100%;
         border: 1px ${props => props.theme.colors.buttons.border.border} solid;
         border-radius: ${props => props.theme.radii[2]}px;
@@ -185,7 +184,9 @@ function SearchBar() {
 const Input = styled.input`
   height: 38px;
   width: 100%;
-  min-width: calc(${props => props.theme.space[9]}px * 2);
+  // min-width causes the filters and the actual input text to be broken into
+  // two lines when there is no space
+  min-width: calc(${props => props.theme.space[8]}px * 2);
   background: transparent;
   color: inherit;
   box-sizing: border-box;
diff --git a/web/packages/teleterm/src/ui/TopBar/TopBar.tsx b/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
index f208c825b8aee..f518c0c90f776 100644
--- a/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
+++ b/web/packages/teleterm/src/ui/TopBar/TopBar.tsx
@@ -59,6 +59,7 @@ const CentralContainer = styled(Flex).attrs({ gap: 3 })`
   align-items: center;
   justify-content: center;
   height: 100%;
+  min-width: 0;
   max-width: calc(${props => props.theme.space[10]}px * 9);
 `;