diff --git a/app/src/atoms/InputField/index.tsx b/app/src/atoms/InputField/index.tsx
index 72cac9892ab..d67710557f6 100644
--- a/app/src/atoms/InputField/index.tsx
+++ b/app/src/atoms/InputField/index.tsx
@@ -255,7 +255,9 @@ function Input(props: InputFieldProps): JSX.Element {
           paddingTop={SPACING.spacing4}
           flexDirection={DIRECTION_COLUMN}
         >
-          <Flex css={FORM_BOTTOM_SPACE_STYLE}>{props.caption}</Flex>
+          {props.caption != null ? (
+            <Flex css={FORM_BOTTOM_SPACE_STYLE}>{props.caption}</Flex>
+          ) : null}
           {props.secondaryCaption != null ? (
             <Flex css={FORM_BOTTOM_SPACE_STYLE}>{props.secondaryCaption}</Flex>
           ) : null}
diff --git a/app/src/atoms/MenuList/DropdownMenu.tsx b/app/src/atoms/MenuList/DropdownMenu.tsx
index 929528c07cc..9693efa920a 100644
--- a/app/src/atoms/MenuList/DropdownMenu.tsx
+++ b/app/src/atoms/MenuList/DropdownMenu.tsx
@@ -89,7 +89,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
 
   return (
     <Flex flexDirection={DIRECTION_COLUMN}>
-      {title !== undefined ? (
+      {title !== null ? (
         <StyledText as="labelSemiBold" paddingBottom={SPACING.spacing8}>
           {title}
         </StyledText>
@@ -120,6 +120,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element {
           left={SPACING.spacing16}
           flexDirection={DIRECTION_COLUMN}
           width={width}
+          ref={dropDownMenuWrapperRef}
         >
           {filterOptions.map((option, index) => (
             <MenuItem
diff --git a/app/src/organisms/NetworkSettings/SetWifiCred.tsx b/app/src/organisms/NetworkSettings/SetWifiCred.tsx
index 2eeb5c4f4b2..6c64ceed9bf 100644
--- a/app/src/organisms/NetworkSettings/SetWifiCred.tsx
+++ b/app/src/organisms/NetworkSettings/SetWifiCred.tsx
@@ -57,7 +57,7 @@ export function SetWifiCred({
               onChange={e => setPassword(e.target.value)}
               type={showPassword ? 'text' : 'password'}
               onBlur={e => e.target.focus()}
-              autoFocus={true}
+              autoFocus
             />
           </Box>
           <Btn
diff --git a/app/src/organisms/NetworkSettings/SetWifiSsid.tsx b/app/src/organisms/NetworkSettings/SetWifiSsid.tsx
index 7794c84e15a..f954cb9c7f2 100644
--- a/app/src/organisms/NetworkSettings/SetWifiSsid.tsx
+++ b/app/src/organisms/NetworkSettings/SetWifiSsid.tsx
@@ -53,7 +53,7 @@ export function SetWifiSsid({
           type="text"
           error={errorMessage}
           onBlur={e => e.target.focus()}
-          autoFocus={true}
+          autoFocus
         />
       </Flex>
       <Flex width="100%" position={POSITION_FIXED} left="0" bottom="0">