diff --git a/src/actions/compose.ts b/src/actions/compose.ts
index b781b99b5..c71524195 100644
--- a/src/actions/compose.ts
+++ b/src/actions/compose.ts
@@ -524,7 +524,7 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, composeId,
     params: {
       q: token.slice(1),
       resolve: false,
-      limit: 4,
+      limit: 10,
     },
   }).then(response => {
     dispatch(importFetchedAccounts(response.data));
@@ -538,7 +538,7 @@ const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, composeId,
 
 const fetchComposeSuggestionsEmojis = (dispatch: AppDispatch, getState: () => RootState, composeId: string, token: string) => {
   const state = getState();
-  const results = emojiSearch(token.replace(':', ''), { maxResults: 5 }, state.custom_emojis);
+  const results = emojiSearch(token.replace(':', ''), { maxResults: 10 }, state.custom_emojis);
 
   dispatch(readyComposeSuggestionsEmojis(composeId, token, results));
 };
@@ -565,7 +565,7 @@ const fetchComposeSuggestionsTags = (dispatch: AppDispatch, getState: () => Root
     }),
     params: {
       q: token.slice(1),
-      limit: 4,
+      limit: 10,
       type: 'hashtags',
     },
   }).then(response => {
diff --git a/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
index 34b929d13..33ab39b0f 100644
--- a/src/features/compose/editor/plugins/autosuggest-plugin.tsx
+++ b/src/features/compose/editor/plugins/autosuggest-plugin.tsx
@@ -538,7 +538,7 @@ const AutosuggestPlugin = ({
           ? ReactDOM.createPortal(
             <div
               className={clsx({
-                'mt-6 relative w-max z-1000 shadow bg-white dark:bg-gray-900 rounded-lg py-1 space-y-0 dark:ring-2 dark:ring-primary-700 focus:outline-none': true,
+                'mt-6 overflow-y-auto max-h-56 relative w-max z-1000 shadow bg-white dark:bg-gray-900 rounded-lg py-1 space-y-0 dark:ring-2 dark:ring-primary-700 focus:outline-none': true,
                 hidden: suggestionsHidden || suggestions.isEmpty(),
                 block: !suggestionsHidden && !suggestions.isEmpty(),
               })}