diff --git a/src/app/ItemSearchPage.js b/src/app/ItemSearchPage.js
index e4a9e96..6025ea2 100644
--- a/src/app/ItemSearchPage.js
+++ b/src/app/ItemSearchPage.js
@@ -26,6 +26,7 @@ function ItemSearchPage() {
         showItemsLabel
         background={brightBackground}
         boxShadow="md"
+        autoFocus
       />
       <Box height="6" />
       <ItemSearchPageResults query={query} />
diff --git a/src/app/WardrobePage/SearchToolbar.js b/src/app/WardrobePage/SearchToolbar.js
index b33d461..8571eba 100644
--- a/src/app/WardrobePage/SearchToolbar.js
+++ b/src/app/WardrobePage/SearchToolbar.js
@@ -42,6 +42,7 @@ function SearchToolbar({
   searchQueryRef,
   firstSearchResultRef,
   onChange,
+  autoFocus,
   showItemsLabel = false,
   background = null,
   boxShadow = null,
@@ -188,8 +189,12 @@ function SearchToolbar({
               <SearchIcon color="gray.400" />
             </InputLeftElement>
           )}
-          <Input background={background} {...inputProps} />
-          {(query.value || queryFilterText) && (
+          <Input
+            background={background}
+            autoFocus={autoFocus}
+            {...inputProps}
+          />
+          {!searchQueryIsEmpty(query) && (
             <InputRightElement>
               <IconButton
                 icon={<CloseIcon />}