diff --git a/app/assets/javascripts/components/AutocompleteTagHint.tsx b/app/assets/javascripts/components/AutocompleteTagHint.tsx
index ec5905000..84c172196 100644
--- a/app/assets/javascripts/components/AutocompleteTagHint.tsx
+++ b/app/assets/javascripts/components/AutocompleteTagHint.tsx
@@ -33,7 +33,9 @@ export const AutocompleteTagHint = observer(
               type="hashtag"
               className="sn-icon--small color-neutral mr-1"
             />
-            {autocompleteSearchQuery}
+            <span className="max-w-40 whitespace-nowrap overflow-hidden overflow-ellipsis">
+              {autocompleteSearchQuery}
+            </span>
           </span>
         </button>
       </>
diff --git a/app/assets/stylesheets/_sn.scss b/app/assets/stylesheets/_sn.scss
index 94dc079c1..0a03d1d58 100644
--- a/app/assets/stylesheets/_sn.scss
+++ b/app/assets/stylesheets/_sn.scss
@@ -190,6 +190,10 @@
   max-width: 20rem;
 }
 
+.max-w-40 {
+  max-width: 10rem;
+}
+
 .min-w-5 {
   min-width: 1.25rem;
 }