diff --git a/client/src/components/Header/AddServer.tsx b/client/src/components/Header/AddServer.tsx
index b4f2b53..a2b8c2a 100644
--- a/client/src/components/Header/AddServer.tsx
+++ b/client/src/components/Header/AddServer.tsx
@@ -9,7 +9,7 @@ import {
   alpha,
   styled,
 } from '@mui/material';
-import { useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { postData } from '../../apiUtil';
 import { useLoadingContext } from '../../context/LoadingContext';
@@ -25,10 +25,6 @@ const AddServerInput = styled('div')(({ theme }) => ({
   marginRight: theme.spacing(2),
   marginLeft: 0,
   width: '100%',
-  [theme.breakpoints.up('sm')]: {
-    marginLeft: theme.spacing(3),
-    width: 'auto',
-  },
 }));
 
 const StyledInputBase = styled(InputBase)(({ theme }) => ({
@@ -36,10 +32,7 @@ const StyledInputBase = styled(InputBase)(({ theme }) => ({
   '& .MuiInputBase-input': {
     padding: theme.spacing(1, 1, 1, 1),
     transition: theme.transitions.create('width'),
-    width: '100%',
-    [theme.breakpoints.up('md')]: {
-      width: '20ch',
-    },
+    width: '25ch',
   },
 }));
 
@@ -55,10 +48,19 @@ export default function AddServer({ servers, setServers }: AddServerProps) {
   const inputRef = useRef<HTMLInputElement>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [showAddServer, setShowAddServer] = useState(false);
+  const [inputWidth, setInputWidth] = useState(0);
   const toggleShowAddServer = () => {
     setShowAddServer((prev) => !prev);
   };
 
+  useEffect(() => {
+    if (showAddServer && containerRef.current) {
+      setInputWidth(containerRef.current.scrollWidth);
+    } else {
+      setInputWidth(0);
+    }
+  }, [showAddServer]);
+
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     if (inputRef.current) {
@@ -121,9 +123,32 @@ export default function AddServer({ servers, setServers }: AddServerProps) {
 
   return (
     <>
-      <Box ref={containerRef} className="overflow-hidden pl-4">
+      <Tooltip title="Add a server." arrow disableInteractive>
+        <IconButton
+          disabled={showAddServer}
+          onClick={() => {
+            toggleShowAddServer();
+            setTimeout(() => {
+              if (inputRef.current) {
+                inputRef.current.focus();
+              }
+            }, 300);
+          }}
+        >
+          <Add />
+        </IconButton>
+      </Tooltip>
+      <Box
+        ref={containerRef}
+        className="overflow-hidden"
+        sx={{
+          transition: 'all 0.2s ease',
+          maxWidth: inputWidth,
+        }}
+      >
         <Slide
           in={showAddServer}
+          className="mx-0"
           direction="left"
           container={containerRef.current}
         >
@@ -157,20 +182,6 @@ export default function AddServer({ servers, setServers }: AddServerProps) {
           </AddServerInput>
         </Slide>
       </Box>
-      <Tooltip title="Add a server." arrow disableInteractive>
-        <IconButton
-          onClick={() => {
-            toggleShowAddServer();
-            setTimeout(() => {
-              if (inputRef.current) {
-                inputRef.current.focus();
-              }
-            }, 300);
-          }}
-        >
-          <Add />
-        </IconButton>
-      </Tooltip>
     </>
   );
 }
diff --git a/client/src/components/Header/SearchServers.tsx b/client/src/components/Header/SearchServers.tsx
index 2d80166..04c82a2 100644
--- a/client/src/components/Header/SearchServers.tsx
+++ b/client/src/components/Header/SearchServers.tsx
@@ -69,8 +69,6 @@ export default function SearchServers({
   });
 
   useEffect(() => {
-    // Populate search state with URL params only if loading the home page
-    // Home page manages updating URL params
     if (showSearchServer && containerRef.current) {
       setContentHeight(containerRef.current.scrollHeight);
     } else {
@@ -140,7 +138,7 @@ export default function SearchServers({
       className="overflow-hidden"
       sx={{
         transition: 'all 0.3s ease',
-        maxHeight: showSearchServer ? contentHeight : 0,
+        maxHeight: contentHeight,
         backgroundColor: (theme) =>
           theme.palette.mode === 'dark'
             ? 'rgba(255, 255, 255, .06)'