diff --git a/src/actions/search.ts b/src/actions/search.ts
index eaa0ac532..6a03bb26d 100644
--- a/src/actions/search.ts
+++ b/src/actions/search.ts
@@ -38,7 +38,7 @@ const submitSearch = (value: string, filter?: SearchFilter) =>
 
     // An empty search doesn't return any results
     if (value.length === 0) {
-      return;
+      return dispatch(clearSearchResults());
     }
 
     dispatch(fetchSearchRequest(value));
diff --git a/src/features/compose/components/search-results.tsx b/src/features/compose/components/search-results.tsx
index db6a51c07..9342b1eae 100644
--- a/src/features/compose/components/search-results.tsx
+++ b/src/features/compose/components/search-results.tsx
@@ -220,7 +220,7 @@ const SearchResults = () => {
   return (
     <>
       {filterByAccount ? (
-        <HStack className='mb-4 border-b border-solid border-gray-200 px-2 pb-4 dark:border-gray-800' space={2}>
+        <HStack className='border-b border-solid border-gray-200 p-2 pb-4 dark:border-gray-800' space={2}>
           <IconButton iconClassName='h-5 w-5' src={require('@tabler/icons/outline/x.svg')} onClick={handleUnsetAccount} />
           <Text truncate>
             <FormattedMessage