diff --git a/src/components/shortcuts-settings.jsx b/src/components/shortcuts-settings.jsx
index f52693e0..b21ff898 100644
--- a/src/components/shortcuts-settings.jsx
+++ b/src/components/shortcuts-settings.jsx
@@ -336,9 +336,14 @@ function ShortcutForm({ type, lists, followedHashtags, onSubmit }) {
                     name={name}
                     placeholder={placeholder}
                     required={type === 'text'}
+                    list={
+                      currentType === 'hashtag'
+                        ? 'followed-hashtags-datalist'
+                        : null
+                    }
                   />
                   {currentType === 'hashtag' && followedHashtags.length > 0 && (
-                    <datalist>
+                    <datalist id="followed-hashtags-datalist">
                       {followedHashtags.map((tag) => (
                         <option value={tag.name} />
                       ))}