diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
index 2e212b8ab4..bb71d1309d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
@@ -18,17 +18,13 @@ package com.keylesspalace.tusky
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import android.view.WindowManager
 import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AlertDialog
-import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
 import com.keylesspalace.tusky.adapter.ItemInteractionListener
@@ -37,13 +33,13 @@ import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.MainTabsChangedEvent
 import com.keylesspalace.tusky.components.account.list.ListSelectionFragment
 import com.keylesspalace.tusky.databinding.ActivityTabPreferenceBinding
-import com.keylesspalace.tusky.databinding.DialogAddHashtagBinding
 import com.keylesspalace.tusky.entity.MastoList
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.hashtagPattern
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
+import com.keylesspalace.tusky.view.showHashtagPickerDialog
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
@@ -224,39 +220,21 @@ class TabPreferenceActivity : BaseActivity(), ItemInteractionListener, ListSelec
     }
 
     private fun showAddHashtagDialog(tab: TabData? = null, tabPosition: Int = 0) {
-        val dialogBinding = DialogAddHashtagBinding.inflate(layoutInflater)
-        val editText = dialogBinding.addHashtagEditText
-
-        val dialog = MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.add_hashtag_title)
-            .setView(dialogBinding.root)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.action_save) { _, _ ->
-                val input = editText.text.toString().trim()
-                if (tab == null) {
-                    val newTab = createTabDataFromId(HASHTAG, listOf(input))
-                    currentTabs.add(newTab)
-                    currentTabsAdapter.notifyItemInserted(currentTabs.size - 1)
-                } else {
-                    val newTab = tab.copy(arguments = tab.arguments + input)
-                    currentTabs[tabPosition] = newTab
-
-                    currentTabsAdapter.notifyItemChanged(tabPosition)
-                }
-
-                updateAvailableTabs()
-                saveTabs()
+        showHashtagPickerDialog(mastodonApi, R.string.add_hashtag_title) { hashtag ->
+            if (tab == null) {
+                val newTab = createTabDataFromId(HASHTAG, listOf(hashtag))
+                currentTabs.add(newTab)
+                currentTabsAdapter.notifyItemInserted(currentTabs.size - 1)
+            } else {
+                val newTab = tab.copy(arguments = tab.arguments + hashtag)
+                currentTabs[tabPosition] = newTab
+
+                currentTabsAdapter.notifyItemChanged(tabPosition)
             }
-            .create()
 
-        editText.doOnTextChanged { s, _, _, _ ->
-            dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(s)
+            updateAvailableTabs()
+            saveTabs()
         }
-
-        dialog.show()
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(editText.text)
-        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        editText.requestFocus()
     }
 
     private var listSelectDialog: ListSelectionFragment? = null
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index 80db564672..2b288aeb4e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -464,9 +464,9 @@ class ComposeActivity :
         binding.composeEditField.setAdapter(
             ComposeAutoCompleteAdapter(
                 this,
-                preferences.getBoolean(PrefKeys.ANIMATE_GIF_AVATARS, false),
-                preferences.getBoolean(PrefKeys.ANIMATE_CUSTOM_EMOJIS, false),
-                preferences.getBoolean(PrefKeys.SHOW_BOT_OVERLAY, true)
+                animateAvatar = preferences.getBoolean(PrefKeys.ANIMATE_GIF_AVATARS, false),
+                animateEmojis = preferences.getBoolean(PrefKeys.ANIMATE_CUSTOM_EMOJIS, false),
+                showBotBadge = preferences.getBoolean(PrefKeys.SHOW_BOT_OVERLAY, true)
             )
         )
         binding.composeEditField.setTokenizer(ComposeTokenizer())
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeAutoCompleteAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeAutoCompleteAdapter.kt
index 4b608d3b92..a7b2d8a165 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeAutoCompleteAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeAutoCompleteAdapter.kt
@@ -37,7 +37,9 @@ class ComposeAutoCompleteAdapter(
     private val autocompletionProvider: AutocompletionProvider,
     private val animateAvatar: Boolean,
     private val animateEmojis: Boolean,
-    private val showBotBadge: Boolean
+    private val showBotBadge: Boolean,
+    // if true, @ # : are returned in the result, otherwise only the raw value
+    private val withDecoration: Boolean = true,
 ) : BaseAdapter(), Filterable {
 
     private var resultList: List<AutocompleteResult> = emptyList()
@@ -52,37 +54,35 @@ class ComposeAutoCompleteAdapter(
         return position.toLong()
     }
 
-    override fun getFilter(): Filter {
-        return object : Filter() {
+    override fun getFilter() = object : Filter() {
 
-            override fun convertResultToString(resultValue: Any): CharSequence {
-                return when (resultValue) {
-                    is AutocompleteResult.AccountResult -> "@${resultValue.account.username}"
-                    is AutocompleteResult.HashtagResult -> "#${resultValue.hashtag}"
-                    is AutocompleteResult.EmojiResult -> ":${resultValue.emoji.shortcode}:"
-                    else -> ""
-                }
+        override fun convertResultToString(resultValue: Any): CharSequence {
+            return when (resultValue) {
+                is AutocompleteResult.AccountResult -> if (withDecoration) "@${resultValue.account.username}" else resultValue.account.username
+                is AutocompleteResult.HashtagResult -> if (withDecoration) "#${resultValue.hashtag}" else resultValue.hashtag
+                is AutocompleteResult.EmojiResult -> if (withDecoration) ":${resultValue.emoji.shortcode}:" else resultValue.emoji.shortcode
+                else -> ""
             }
+        }
 
-            @WorkerThread
-            override fun performFiltering(constraint: CharSequence?): FilterResults {
-                val filterResults = FilterResults()
-                if (constraint != null) {
-                    val results = autocompletionProvider.search(constraint.toString())
-                    filterResults.values = results
-                    filterResults.count = results.size
-                }
-                return filterResults
+        @WorkerThread
+        override fun performFiltering(constraint: CharSequence?): FilterResults {
+            val filterResults = FilterResults()
+            if (constraint != null) {
+                val results = autocompletionProvider.search(constraint.toString())
+                filterResults.values = results
+                filterResults.count = results.size
             }
+            return filterResults
+        }
 
-            @Suppress("UNCHECKED_CAST")
-            override fun publishResults(constraint: CharSequence?, results: FilterResults) {
-                if (results.count > 0) {
-                    resultList = results.values as List<AutocompleteResult>
-                    notifyDataSetChanged()
-                } else {
-                    notifyDataSetInvalidated()
-                }
+        @Suppress("UNCHECKED_CAST")
+        override fun publishResults(constraint: CharSequence?, results: FilterResults) {
+            if (results.count > 0) {
+                resultList = results.values as List<AutocompleteResult>
+                notifyDataSetChanged()
+            } else {
+                notifyDataSetInvalidated()
             }
         }
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
index ba0d327aeb..3c6fe5d47f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
@@ -3,7 +3,6 @@ package com.keylesspalace.tusky.components.followedtags
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
-import android.view.WindowManager
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
@@ -11,14 +10,11 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import at.connyduck.calladapter.networkresult.fold
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.StatusListActivity
-import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter
 import com.keylesspalace.tusky.databinding.ActivityFollowedTagsBinding
-import com.keylesspalace.tusky.databinding.DialogFollowHashtagBinding
 import com.keylesspalace.tusky.interfaces.HashtagActionListener
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.copyToClipboard
@@ -26,6 +22,7 @@ import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
+import com.keylesspalace.tusky.view.showHashtagPickerDialog
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.flow.collectLatest
@@ -34,8 +31,8 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class FollowedTagsActivity :
     BaseActivity(),
-    HashtagActionListener,
-    ComposeAutoCompleteAdapter.AutocompletionProvider {
+    HashtagActionListener {
+
     @Inject
     lateinit var api: MastodonApi
 
@@ -105,7 +102,7 @@ class FollowedTagsActivity :
 
     private fun follow(tagName: String, position: Int = -1) {
         lifecycleScope.launch {
-            api.followTag(tagName).fold(
+            val snackbarText = api.followTag(tagName).fold(
                 {
                     if (position == -1) {
                         viewModel.tags.add(it)
@@ -113,17 +110,20 @@ class FollowedTagsActivity :
                         viewModel.tags.add(position, it)
                     }
                     viewModel.currentSource?.invalidate()
+                    getString(R.string.follow_hashtag_success, tagName)
                 },
-                {
-                    Snackbar.make(
-                        this@FollowedTagsActivity,
-                        binding.followedTagsView,
-                        getString(R.string.error_following_hashtag_format, tagName),
-                        Snackbar.LENGTH_SHORT
-                    )
-                        .show()
+                { t ->
+                    Log.w(TAG, "failed to follow hashtag $tagName", t)
+                    getString(R.string.error_following_hashtag_format, tagName)
                 }
             )
+            Snackbar.make(
+                this@FollowedTagsActivity,
+                binding.followedTagsView,
+                snackbarText,
+                Snackbar.LENGTH_SHORT
+            )
+                .show()
         }
     }
 
@@ -160,10 +160,6 @@ class FollowedTagsActivity :
         }
     }
 
-    override fun search(token: String): List<ComposeAutoCompleteAdapter.AutocompleteResult> {
-        return viewModel.searchAutocompleteSuggestions(token)
-    }
-
     override fun viewTag(tagName: String) {
         startActivity(StatusListActivity.newHashtagIntent(this, tagName))
     }
@@ -176,30 +172,9 @@ class FollowedTagsActivity :
     }
 
     private fun showDialog() {
-        val dialogBinding = DialogFollowHashtagBinding.inflate(layoutInflater)
-        dialogBinding.hashtagAutoCompleteTextView.setAdapter(
-            ComposeAutoCompleteAdapter(
-                this,
-                animateAvatar = false,
-                animateEmojis = false,
-                showBotBadge = false
-            )
-        )
-        dialogBinding.hashtagAutoCompleteTextView.requestFocus()
-        dialogBinding.hashtagAutoCompleteTextView.setSelection(dialogBinding.hashtagAutoCompleteTextView.length())
-
-        val dialog = MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.dialog_follow_hashtag_title)
-            .setView(dialogBinding.root)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                follow(
-                    dialogBinding.hashtagAutoCompleteTextView.text.toString().removePrefix("#")
-                )
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .create()
-        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        dialog.show()
+        showHashtagPickerDialog(api, R.string.dialog_follow_hashtag_title) { hashtag ->
+            follow(hashtag)
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsViewModel.kt
index bebc4ff9fe..590036cb0f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsViewModel.kt
@@ -1,24 +1,19 @@
 package com.keylesspalace.tusky.components.followedtags
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.fold
-import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter
-import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.entity.HashTag
 import com.keylesspalace.tusky.network.MastodonApi
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 
 @HiltViewModel
 class FollowedTagsViewModel @Inject constructor(
-    private val api: MastodonApi
+    val api: MastodonApi
 ) : ViewModel() {
     val tags: MutableList<HashTag> = mutableListOf()
     var nextKey: String? = null
@@ -39,24 +34,6 @@ class FollowedTagsViewModel @Inject constructor(
         }
     ).flow.cachedIn(viewModelScope)
 
-    fun searchAutocompleteSuggestions(
-        token: String
-    ): List<ComposeAutoCompleteAdapter.AutocompleteResult> {
-        return runBlocking {
-            api.search(query = token, type = SearchType.Hashtag.apiParameter, limit = 10)
-                .fold({ searchResult ->
-                    searchResult.hashtags.map {
-                        ComposeAutoCompleteAdapter.AutocompleteResult.HashtagResult(
-                            it.name
-                        )
-                    }
-                }, { e ->
-                    Log.e(TAG, "Autocomplete search for $token failed.", e)
-                    emptyList()
-                })
-        }
-    }
-
     companion object {
         private const val TAG = "FollowedTagsViewModel"
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/HashtagPickerDialog.kt b/app/src/main/java/com/keylesspalace/tusky/view/HashtagPickerDialog.kt
new file mode 100644
index 0000000000..2e3ccf9187
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/view/HashtagPickerDialog.kt
@@ -0,0 +1,118 @@
+/* Copyright 2025 Tusky Contributors
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+@file:JvmName("HashTagPickerDialog")
+
+package com.keylesspalace.tusky.view
+
+import android.content.Context
+import android.util.Log
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.WindowManager
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import android.widget.TextView.OnEditorActionListener
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.doOnTextChanged
+import at.connyduck.calladapter.networkresult.fold
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter
+import com.keylesspalace.tusky.components.search.SearchType
+import com.keylesspalace.tusky.databinding.DialogPickHashtagBinding
+import com.keylesspalace.tusky.network.MastodonApi
+import com.keylesspalace.tusky.util.hashtagPattern
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.runBlocking
+
+fun Context.showHashtagPickerDialog(
+    api: MastodonApi,
+    @StringRes title: Int,
+    onHashtagSelected: (String) -> Unit
+) {
+    val dialogScope = CoroutineScope(Dispatchers.Main)
+    val dialogBinding = DialogPickHashtagBinding.inflate(LayoutInflater.from(this))
+    val autocompleteTextView = dialogBinding.pickHashtagEditText
+
+    val autoCompleteProvider = object : ComposeAutoCompleteAdapter.AutocompletionProvider {
+        override fun search(token: String): List<ComposeAutoCompleteAdapter.AutocompleteResult> {
+            return runBlocking {
+                api.search(query = token, type = SearchType.Hashtag.apiParameter, limit = 5)
+                    .fold({ searchResult ->
+                        searchResult.hashtags.map {
+                            ComposeAutoCompleteAdapter.AutocompleteResult.HashtagResult(
+                                it.name
+                            )
+                        }
+                    }, { e ->
+                        Log.e("HashtagPickerDialog", "Autocomplete search for $token failed", e)
+                        emptyList()
+                    })
+            }
+        }
+    }
+
+    autocompleteTextView.setAdapter(
+        ComposeAutoCompleteAdapter(
+            autoCompleteProvider,
+            animateAvatar = false,
+            animateEmojis = false,
+            showBotBadge = false,
+            withDecoration = false
+        )
+    )
+
+    autocompleteTextView.setSelection(autocompleteTextView.length())
+
+    val dialog = MaterialAlertDialogBuilder(this)
+        .setTitle(title)
+        .setView(dialogBinding.root)
+        .setPositiveButton(android.R.string.ok) { _, _ ->
+            onHashtagSelected(autocompleteTextView.text.toString())
+        }
+        .setNegativeButton(android.R.string.cancel, null)
+        .setOnDismissListener {
+            dialogScope.cancel()
+        }
+        .create()
+
+    autocompleteTextView.doOnTextChanged { s, _, _, _ ->
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(s)
+    }
+
+    autocompleteTextView.setOnEditorActionListener(object : OnEditorActionListener {
+        override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean {
+            if (actionId == EditorInfo.IME_ACTION_DONE && validateHashtag(autocompleteTextView.text)) {
+                onHashtagSelected(autocompleteTextView.text.toString())
+                dialog.dismiss()
+                return true
+            }
+            return false
+        }
+    })
+
+    dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+    dialog.show()
+    dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(autocompleteTextView.text)
+    autocompleteTextView.requestFocus()
+}
+
+private fun validateHashtag(input: CharSequence?): Boolean {
+    val trimmedInput = input?.trim() ?: ""
+    return trimmedInput.isNotEmpty() && hashtagPattern.matcher(trimmedInput).matches()
+}
diff --git a/app/src/main/res/layout/dialog_add_hashtag.xml b/app/src/main/res/layout/dialog_add_hashtag.xml
deleted file mode 100644
index 799a1fb26b..0000000000
--- a/app/src/main/res/layout/dialog_add_hashtag.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="20dp"
-    android:paddingTop="16dp"
-    android:paddingRight="20dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/addHashtagInputLayout"
-        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/edit_hashtag_hint"
-        app:endIconMode="none">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/addHashtagEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textNoSuggestions"
-            android:lines="1" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/dialog_follow_hashtag.xml b/app/src/main/res/layout/dialog_pick_hashtag.xml
similarity index 74%
rename from app/src/main/res/layout/dialog_follow_hashtag.xml
rename to app/src/main/res/layout/dialog_pick_hashtag.xml
index dca465eaf5..3fb413f054 100644
--- a/app/src/main/res/layout/dialog_follow_hashtag.xml
+++ b/app/src/main/res/layout/dialog_pick_hashtag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,21 +8,23 @@
     android:paddingRight="20dp">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/hashtagAutoCompleteInputLayout"
+        android:id="@+id/pickHashtagInputLayout"
         style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/dialog_follow_hashtag_hint"
+        android:hint="@string/pick_hashtag_hint"
         app:endIconMode="none">
 
         <!-- textNoSuggestions is to disable spell check, it will auto-complete -->
         <com.google.android.material.textfield.MaterialAutoCompleteTextView
-            android:id="@+id/hashtagAutoCompleteTextView"
+            android:id="@+id/pickHashtagEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:completionThreshold="2"
+            android:imeOptions="actionDone"
             android:inputType="textNoSuggestions"
             android:lines="1" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_autocomplete_hashtag.xml b/app/src/main/res/layout/item_autocomplete_hashtag.xml
index fdb3625397..6d5ec5aafc 100644
--- a/app/src/main/res/layout/item_autocomplete_hashtag.xml
+++ b/app/src/main/res/layout/item_autocomplete_hashtag.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/hashtag"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:ellipsize="end"
     android:maxLines="1"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8a121f148c..94d6534e08 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -350,7 +350,7 @@
     <string name="downloading_media">جارٍ تنزيل الوسائط</string>
     <string name="dialog_redraft_post_warning">هل تريد حذف وإعادة صياغة هذا التبويق؟</string>
     <string name="description_post_favourited">تم تفضيله</string>
-    <string name="edit_hashtag_hint">وسم بدون #</string>
+    <string name="pick_hashtag_hint">وسم بدون #</string>
     <string name="notifications_clear">مسح</string>
     <string name="notifications_apply_filter">عامل تصفية</string>
     <string name="filter_apply">طَبِّق</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 85e12bb8e0..8d94b4b975 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -453,7 +453,7 @@
     <string name="add_hashtag_title">Дадаць хэштэг</string>
     <string name="description_post_reblogged">Пашырана</string>
     <string name="description_poll">Апытанне з варыянтамі: %1$s, %2$s, %3$s, %4$s; %5$s</string>
-    <string name="edit_hashtag_hint">Хэштэг без #</string>
+    <string name="pick_hashtag_hint">Хэштэг без #</string>
     <string name="description_post_edited">Зменена</string>
     <string name="description_post_bookmarked">Дададзена ў закладкі</string>
     <string name="description_post_favourited">Упадабана</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 5915e0d4f4..1df4f3c8a6 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -61,7 +61,7 @@
     <string name="list">Списък</string>
     <string name="select_list_title">Избиране на списък</string>
     <string name="hashtags">Хаштагове</string>
-    <string name="edit_hashtag_hint">Хаштаг без #</string>
+    <string name="pick_hashtag_hint">Хаштаг без #</string>
     <string name="add_hashtag_title">Добавяне на хаштаг</string>
     <string name="hint_list_name">Име на списък</string>
     <string name="description_poll">Анкета с избори: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 01f69ef46b..4537e29b5e 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -383,7 +383,7 @@
     <string name="filter_apply">প্রয়োগ</string>
     <string name="notifications_apply_filter">ফিল্টার</string>
     <string name="notifications_clear">পরিষ্কার</string>
-    <string name="edit_hashtag_hint"># ছাড়া হ্যাশট্যাগ</string>
+    <string name="pick_hashtag_hint"># ছাড়া হ্যাশট্যাগ</string>
     <string name="hint_list_name">নামের তালিকা</string>
     <string name="title_favourites">প্রিয়গুলো</string>
     <string name="title_followers">অনুগামিবৃন্দ</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 492bff1902..7e950ed21c 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -351,7 +351,7 @@
     <string name="description_visibility_direct">সরাসরি</string>
     <string name="description_poll">পছন্দগুলি সহ নর্বাচন: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">নামের তালিকা</string>
-    <string name="edit_hashtag_hint"># ছাড়া হ্যাশট্যাগ</string>
+    <string name="pick_hashtag_hint"># ছাড়া হ্যাশট্যাগ</string>
     <string name="notifications_clear">পরিষ্কার</string>
     <string name="notifications_apply_filter">ফিল্টার</string>
     <string name="filter_apply">প্রয়োগ</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4dc238329e..b737e3664b 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -347,7 +347,7 @@
     <string name="description_visibility_private">Seguidors</string>
     <string name="description_visibility_direct">Directe</string>
     <string name="hint_list_name">Nom de la llista</string>
-    <string name="edit_hashtag_hint">Hashtag sense #</string>
+    <string name="pick_hashtag_hint">Hashtag sense #</string>
     <string name="notifications_clear">Netejar</string>
     <string name="notifications_apply_filter">Filtrar</string>
     <string name="filter_apply">Aplicar</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 791a7b3860..42c486a070 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -306,7 +306,7 @@
     <string name="list">لیست</string>
     <string name="select_list_title">دیاریکردنی لیست</string>
     <string name="hashtags">هاشتاگی</string>
-    <string name="edit_hashtag_hint">هاشتاگی بێ #</string>
+    <string name="pick_hashtag_hint">هاشتاگی بێ #</string>
     <string name="add_hashtag_title">هاشتاگی زیاد بکە</string>
     <string name="hint_list_name">ناوی لیست</string>
     <string name="description_poll">ڕاپرسی لەگەڵ هەڵبژاردنەکان: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 195a25b66d..fd7c0f3685 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -351,7 +351,7 @@
     <string name="description_visibility_private">Pro sledující</string>
     <string name="description_visibility_direct">Přímý</string>
     <string name="hint_list_name">Název seznamu</string>
-    <string name="edit_hashtag_hint">Hashtag bez #</string>
+    <string name="pick_hashtag_hint">Hashtag bez #</string>
     <string name="compose_shortcut_long_label">Napsat příspěvek</string>
     <string name="compose_shortcut_short_label">Napsat</string>
     <string name="notifications_clear">Vyčistit</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 7299cd4c39..1955e96007 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -379,7 +379,7 @@
     <string name="delete_scheduled_post_warning">Dileu\'r neges wedi\'u hamserlennu hon\?</string>
     <string name="description_post_media_no_description_placeholder">Dim disgrifiad</string>
     <string name="hint_list_name">Enw\'r rhestr</string>
-    <string name="edit_hashtag_hint">Hashnod heb #</string>
+    <string name="pick_hashtag_hint">Hashnod heb #</string>
     <string name="report_remote_instance">Anfon ymlaen at %1$s</string>
     <string name="report_description_remote_instance">Daw\'r cyfrif o weinydd arall. Ydych chi am anfon copi dienw o\'r adroddiad i\'r gweinydd hwnnw hefyd\?</string>
     <string name="duration_1_hour">Awr</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9411a6e0f3..ce67b2183c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -319,7 +319,7 @@
     <string name="error_delete_list">Liste konnte nicht gelöscht werden</string>
     <string name="hint_search_people_list">Suche nach Leuten, denen du folgst</string>
     <string name="action_remove_from_list">Konto aus der Liste entfernen</string>
-    <string name="edit_hashtag_hint">Hashtag ohne #</string>
+    <string name="pick_hashtag_hint">Hashtag ohne #</string>
     <string name="action_open_reblogger">Autor*in des geteilten Beitrags öffnen</string>
     <string name="pref_title_public_filter_keywords">Öffentliche Timelines</string>
     <plurals name="favs">
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 45cb0c73e0..b1ff36ed4f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -360,7 +360,7 @@
     <string name="pref_title_animate_gif_avatars">Ebligi GIF-profilbildojn</string>
     <string name="notification_poll_name">Enketoj</string>
     <string name="notification_poll_description">Sciigoj pri enketoj, kiuj finiĝis</string>
-    <string name="edit_hashtag_hint">Kradvorto sen #</string>
+    <string name="pick_hashtag_hint">Kradvorto sen #</string>
     <string name="notifications_clear">Viŝi</string>
     <string name="notifications_apply_filter">Filtri</string>
     <string name="filter_apply">Apliki</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 151f13d5da..f44f7e8b1b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -382,7 +382,7 @@
     <string name="description_visibility_unlisted">Sin listar</string>
     <string name="description_visibility_direct">Directo</string>
     <string name="hint_list_name">Nombre de la lista</string>
-    <string name="edit_hashtag_hint">Etiqueta sin #</string>
+    <string name="pick_hashtag_hint">Etiqueta sin #</string>
     <string name="notifications_clear">Limpiar</string>
     <string name="notifications_apply_filter">Filtro</string>
     <string name="compose_shortcut_long_label">Escribir publicación</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index a28a43b7b5..c4669222ec 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -367,7 +367,7 @@
     <string name="description_visibility_direct">Zuzena</string>
     <string name="description_poll">Inkesta aukerekin: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Zerrendaren izena</string>
-    <string name="edit_hashtag_hint">Traola # gabe</string>
+    <string name="pick_hashtag_hint">Traola # gabe</string>
     <string name="notifications_clear">Garbitu</string>
     <string name="notifications_apply_filter">Iragazi</string>
     <string name="filter_apply">Aplikatu</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6d68367bce..28c9c016e3 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -357,7 +357,7 @@
     <string name="description_visibility_direct">مستقیم</string>
     <string name="description_poll">نظرسنجی با گزینه‌ها: %1$s، %2$s، %3$s، %4$s؛ %5$s</string>
     <string name="hint_list_name">نام سیاهه</string>
-    <string name="edit_hashtag_hint">برچسب بدون #</string>
+    <string name="pick_hashtag_hint">برچسب بدون #</string>
     <string name="notifications_clear">حذف</string>
     <string name="notifications_apply_filter">پالایش</string>
     <string name="filter_apply">اعمال</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 75842f0c9a..0d63065356 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -217,7 +217,7 @@
 \n(enintään %1$d merkkiä)</item>
         <item quantity="other"/>
     </plurals>
-    <string name="edit_hashtag_hint">Aihetunniste ilman #-merkkiä</string>
+    <string name="pick_hashtag_hint">Aihetunniste ilman #-merkkiä</string>
     <string name="title_domain_mutes">Piilotetus verkkonimet</string>
     <string name="action_share_as">Jaa…</string>
     <string name="error_no_web_browser_found">Verkkoselainta ei löytynyt.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 437f38a064..39a5bd1cc8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -350,7 +350,7 @@
     </string>
     <string name="description_visibility_direct">Direct</string>
     <string name="hint_list_name">Nom de la liste</string>
-    <string name="edit_hashtag_hint">Hashtag sans #</string>
+    <string name="pick_hashtag_hint">Hashtag sans #</string>
     <string name="notifications_clear">Supprimer</string>
     <string name="notifications_apply_filter">Filtrer</string>
     <string name="filter_apply">Appliquer</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index e9af2b1b0c..34c61f86ec 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -376,7 +376,7 @@
     <string name="description_visibility_direct">Díreach</string>
     <string name="hint_list_name">Ainm liosta</string>
     <string name="add_hashtag_title">Cuir hashtag leis</string>
-    <string name="edit_hashtag_hint">Hashtag gan #</string>
+    <string name="pick_hashtag_hint">Hashtag gan #</string>
     <string name="select_list_title">Roghnaigh liosta</string>
     <string name="notifications_clear">Glan</string>
     <string name="notifications_apply_filter">Scagaire</string>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index 79991be882..a4b5bb1fad 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -171,7 +171,7 @@
     <string name="notifications_clear">Sguab às</string>
     <string name="list">Liosta</string>
     <string name="select_list_title">Tagh liosta</string>
-    <string name="edit_hashtag_hint">Taga hais gun #</string>
+    <string name="pick_hashtag_hint">Taga hais gun #</string>
     <string name="add_hashtag_title">Cuir taga hais ris</string>
     <string name="hint_list_name">Ainm na liosta</string>
     <string name="description_poll">Cunntas-bheachd le roghainnean: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5d7e5a7f07..181ec1d0ff 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -180,7 +180,7 @@
     <string name="list">Lista</string>
     <string name="select_list_title">Escoller lista</string>
     <string name="hashtags">Cancelos</string>
-    <string name="edit_hashtag_hint">Cancelo sen #</string>
+    <string name="pick_hashtag_hint">Cancelo sen #</string>
     <string name="add_hashtag_title">Engadir cancelo</string>
     <string name="hint_list_name">Nome da lista</string>
     <string name="description_poll">Enquisa con opcións: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e6b06eebf8..50b1ec33ea 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -359,7 +359,7 @@
     <string name="description_visibility_direct">Közvetlen</string>
     <string name="description_poll">Szavazás válaszokkal: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Lista neve</string>
-    <string name="edit_hashtag_hint">Hashtag # nélkül</string>
+    <string name="pick_hashtag_hint">Hashtag # nélkül</string>
     <string name="notifications_clear">Törlés</string>
     <string name="notifications_apply_filter">Szűrés</string>
     <string name="filter_apply">Alkalmaz</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index bb95a9afc0..0fb82aa5e8 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -356,7 +356,7 @@
     <string name="description_visibility_direct">Beint</string>
     <string name="description_poll">Könnun með valkostunum: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Heiti á lista</string>
-    <string name="edit_hashtag_hint">Myllumerki án #</string>
+    <string name="pick_hashtag_hint">Myllumerki án #</string>
     <string name="select_list_title">Veldu lista</string>
     <string name="list">Listi</string>
     <string name="notifications_clear">Eyða</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4946d94b7b..4ef040b22a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -351,7 +351,7 @@
     <string name="download_media">Scarica media</string>
     <string name="downloading_media">Scaricando media</string>
     <string name="compose_shortcut_long_label">Componi post</string>
-    <string name="edit_hashtag_hint">Hashtag senza #</string>
+    <string name="pick_hashtag_hint">Hashtag senza #</string>
     <string name="compose_shortcut_short_label">Componi</string>
     <string name="notifications_clear">Cancella</string>
     <string name="notifications_apply_filter">Filtra</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4ed098d168..2134750c26 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -432,7 +432,7 @@
     <string name="pref_title_enable_swipe_for_tabs">タブ間の切り替えにスワイプのジェスチャーを有効化</string>
     <string name="pref_title_show_cards_in_timelines">リンクのプレビューをタイムラインに表示</string>
     <string name="pref_title_confirm_reblogs">ブーストする前に確認を表示</string>
-    <string name="edit_hashtag_hint">ハッシュタグ (#をつけない)</string>
+    <string name="pick_hashtag_hint">ハッシュタグ (#をつけない)</string>
     <string name="select_list_title">リストを選択</string>
     <string name="poll_info_format"> <!-- 15 votes • 1 hour left --> %1$s • %2$s</string>
     <string name="poll_info_time_absolute">%1$sに終了</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 428e831a8c..ac78351410 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -356,7 +356,7 @@
     <string name="description_visibility_direct">다이렉트</string>
     <string name="description_poll">투표 선택지: %1$s, %2$s, %3$s, %4$s, %5$s</string>
     <string name="hint_list_name">리스트 이름</string>
-    <string name="edit_hashtag_hint">#를 제외한 해시태그</string>
+    <string name="pick_hashtag_hint">#를 제외한 해시태그</string>
     <string name="notifications_clear">알림 지우기</string>
     <string name="notifications_apply_filter">필터</string>
     <string name="filter_apply">적용</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index ce049e4c9e..2edfce74f4 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -531,7 +531,7 @@
     <string name="action_post_failed">Augšupielāde neizdevās</string>
     <string name="action_post_failed_show_drafts">Rādīt melnrakstus</string>
     <string name="action_post_failed_do_nothing">Aizvākt</string>
-    <string name="edit_hashtag_hint">Tēmturis bez #</string>
+    <string name="pick_hashtag_hint">Tēmturis bez #</string>
     <string name="status_edit_info">%1$s laboja</string>
     <string name="action_browser_login">Pieslēgties ar pārlūku</string>
     <string name="description_login">Strādā vairumā gadījumu. Dati netiek nopludināti uz citām lietotnēm.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index a65c9090b3..1b050d7b4b 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -325,7 +325,7 @@
     <string name="description_visibility_private">Følgere</string>
     <string name="description_visibility_direct">Direkte</string>
     <string name="hint_list_name">Listenavn</string>
-    <string name="edit_hashtag_hint">Emneord uten #</string>
+    <string name="pick_hashtag_hint">Emneord uten #</string>
     <string name="notifications_clear">Fjern</string>
     <string name="notifications_apply_filter">Filter</string>
     <string name="filter_apply">Bruk</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 565e3ad7d7..0492b6d9f8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -342,7 +342,7 @@
     <string name="action_add_to_list">Account aan de lijst toevoegen</string>
     <string name="action_remove_from_list">Account uit de lijst verwijderen</string>
     <string name="hint_list_name">Naam van lijst</string>
-    <string name="edit_hashtag_hint">Hashtag zonder #</string>
+    <string name="pick_hashtag_hint">Hashtag zonder #</string>
     <string name="action_delete_and_redraft">Verwijderen en herschrijven</string>
     <string name="dialog_redraft_post_warning">Dit bericht verwijderen en herschrijven\?</string>
     <string name="notifications_clear">Verwijderen</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index bc8b460cfc..eefa5baffa 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -342,7 +342,7 @@
     <string name="description_visibility_private">Seguidors</string>
     <string name="description_visibility_direct">Dirècte</string>
     <string name="hint_list_name">Nom de la lista</string>
-    <string name="edit_hashtag_hint">Etiquetas sens #</string>
+    <string name="pick_hashtag_hint">Etiquetas sens #</string>
     <string name="compose_shortcut_long_label">Escriure una publicacion</string>
     <string name="compose_shortcut_short_label">Redactar</string>
     <string name="action_delete_and_redraft">Suprimir e reformular</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 048575f9c3..cf3a95a4a4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -375,7 +375,7 @@
     <string name="description_visibility_direct">Bezpośrednio</string>
     <string name="description_poll">Głosowanie z opcjami: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Nazwa listy</string>
-    <string name="edit_hashtag_hint">Hashtag bez #</string>
+    <string name="pick_hashtag_hint">Hashtag bez #</string>
     <string name="notifications_clear">Wyczyść</string>
     <string name="notifications_apply_filter">Filtr</string>
     <string name="filter_apply">Zastosuj</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index cd08f227e3..c8b4796dd6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -351,7 +351,7 @@
     <string name="description_visibility_unlisted">Não-listado</string>
     <string name="description_visibility_direct">Direto</string>
     <string name="hint_list_name">Nome da lista</string>
-    <string name="edit_hashtag_hint">Hashtag sem #</string>
+    <string name="pick_hashtag_hint">Hashtag sem #</string>
     <string name="notifications_clear">Excluir notificações</string>
     <string name="notifications_apply_filter">Filtrar notificações</string>
     <string name="filter_apply">Salvar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 7597a604ac..66d0dcc1b4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -396,7 +396,7 @@
     <string name="description_poll">Votação com as opções: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Nome da lista</string>
     <string name="add_hashtag_title">Adicionar hashtag</string>
-    <string name="edit_hashtag_hint">Hashtag sem #</string>
+    <string name="pick_hashtag_hint">Hashtag sem #</string>
     <string name="hashtags">Hashtags</string>
     <string name="select_list_title">Selecionar lista</string>
     <string name="list">Lista</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ba844de119..3ad564ccb9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -374,7 +374,7 @@
     <string name="description_visibility_private">Подписчики</string>
     <string name="description_visibility_direct">Личное упоминание</string>
     <string name="hint_list_name">Название списка</string>
-    <string name="edit_hashtag_hint">Хэштег без #</string>
+    <string name="pick_hashtag_hint">Хэштег без #</string>
     <string name="notifications_clear">Очистить</string>
     <string name="notifications_apply_filter">Фильтр</string>
     <string name="filter_apply">Применить</string>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index cbe93fb835..3402ebf1cd 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -427,7 +427,7 @@
     <string name="list">सूचिः</string>
     <string name="select_list_title">सूचिरवचीयताम्</string>
     <string name="hashtags">निश्रेणिचिह्नशीर्षकाः</string>
-    <string name="edit_hashtag_hint"># चिह्नं विना प्रचलितम्</string>
+    <string name="pick_hashtag_hint"># चिह्नं विना प्रचलितम्</string>
     <string name="add_hashtag_title">प्रचलितं युज्यताम्</string>
     <string name="hint_list_name">सूचिनाम</string>
     <string name="description_poll">मतदाने मतानि- %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index b2f1a34453..db33d5b292 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -319,7 +319,7 @@
     <string name="description_visibility_private">Sledilci</string>
     <string name="description_visibility_direct">Neposredno</string>
     <string name="hint_list_name">Ime seznama</string>
-    <string name="edit_hashtag_hint">Ključnik brez #</string>
+    <string name="pick_hashtag_hint">Ključnik brez #</string>
     <string name="notifications_clear">Počisti</string>
     <string name="notifications_apply_filter">Filter</string>
     <string name="filter_apply">Uporabi</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 12a4f36670..e8c40fb58a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -348,7 +348,7 @@
     <string name="hint_list_name">Listnamn</string>
     <string name="download_media">Ladda ned media</string>
     <string name="downloading_media">Laddar ned media</string>
-    <string name="edit_hashtag_hint">Hashtag utan #</string>
+    <string name="pick_hashtag_hint">Hashtag utan #</string>
     <string name="compose_shortcut_long_label">Skriv inlägg</string>
     <string name="compose_shortcut_short_label">Skriv</string>
     <string name="notifications_clear">Radera</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 5e2d48a376..6cc51c4913 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -56,7 +56,7 @@
     <string name="list">รายการ</string>
     <string name="select_list_title">เลือกรายการ</string>
     <string name="hashtags">แฮชแท็ก</string>
-    <string name="edit_hashtag_hint">แฮชแท็กโดยไม่มี #</string>
+    <string name="pick_hashtag_hint">แฮชแท็กโดยไม่มี #</string>
     <string name="add_hashtag_title">เพิ่มแฮชแท็ก</string>
     <string name="hint_list_name">ชื่อรายการ</string>
     <string name="description_poll">โพลกับตัวเลือก: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e760ec2305..ed5544f888 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -346,7 +346,7 @@
     <string name="description_visibility_direct">Doğrudan</string>
     <string name="description_poll">Seçenekli anket: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="hint_list_name">Liste adı</string>
-    <string name="edit_hashtag_hint"># Etiket olmadan</string>
+    <string name="pick_hashtag_hint"># Etiket olmadan</string>
     <string name="notifications_clear">Sil</string>
     <string name="notifications_apply_filter">Süzgeçle</string>
     <string name="filter_apply">Uygula</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7197bfe00f..3c6fec96ec 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -483,7 +483,7 @@
     <string name="notifications_clear">Видалити</string>
     <string name="list">Список</string>
     <string name="select_list_title">Вибрати список</string>
-    <string name="edit_hashtag_hint">Хештег без #</string>
+    <string name="pick_hashtag_hint">Хештег без #</string>
     <string name="add_hashtag_title">Додати хештег</string>
     <string name="hint_list_name">Назва списку</string>
     <string name="description_poll">Опитування з варіантами: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4d94540376..ccb140d6ce 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -363,7 +363,7 @@
     <string name="list">Danh sách</string>
     <string name="select_list_title">Chọn danh sách</string>
     <string name="hashtags">Hashtag</string>
-    <string name="edit_hashtag_hint">Không cần dấu #</string>
+    <string name="pick_hashtag_hint">Không cần dấu #</string>
     <string name="add_hashtag_title">Thêm hashtag</string>
     <string name="hint_list_name">Tên danh sách</string>
     <string name="description_poll">Lượt bình chọn: %1$s, %2$s, %3$s, %4$s; %5$s</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ca66dd5947..2cb59d7c65 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -350,7 +350,7 @@
         私信
     </string>
     <string name="hint_list_name">列表名</string>
-    <string name="edit_hashtag_hint">话题名（不含前面的 # 号）</string>
+    <string name="pick_hashtag_hint">话题名（不含前面的 # 号）</string>
     <string name="notifications_clear">删除</string>
     <string name="notifications_apply_filter">筛选</string>
     <string name="filter_apply">应用</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 02293ec059..e930ea99f3 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -366,7 +366,7 @@
         私信
     </string>
     <string name="hint_list_name">列表名</string>
-    <string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
+    <string name="pick_hashtag_hint">話題名（不含前面的 # 號）</string>
     <string name="notifications_clear">清空</string>
     <string name="notifications_apply_filter">分類</string>
     <string name="filter_apply">應用</string>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index a0a64dc6e0..01f7b226ef 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -358,7 +358,7 @@
         私信
     </string>
     <string name="hint_list_name">列表名</string>
-    <string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
+    <string name="pick_hashtag_hint">話題名（不含前面的 # 號）</string>
     <string name="notifications_clear">清空</string>
     <string name="notifications_apply_filter">分類</string>
     <string name="filter_apply">應用</string>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 3b5ee2ae7d..f62e08b179 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -361,7 +361,7 @@
         私信
     </string>
     <string name="hint_list_name">列表名</string>
-    <string name="edit_hashtag_hint">话题名（不含前面的 # 号）</string>
+    <string name="pick_hashtag_hint">话题名（不含前面的 # 号）</string>
     <string name="notifications_clear">清空</string>
     <string name="notifications_apply_filter">分类</string>
     <string name="filter_apply">应用</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3a792b7816..96773ce87d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -365,7 +365,7 @@
         私信
     </string>
     <string name="hint_list_name">列表名</string>
-    <string name="edit_hashtag_hint">話題名（不含前面的 # 號）</string>
+    <string name="pick_hashtag_hint">話題名（不含前面的 # 號）</string>
     <string name="notifications_clear">清空</string>
     <string name="notifications_apply_filter">分類</string>
     <string name="filter_apply">應用</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42ce93c84e..0e731a9e2d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,7 +82,7 @@
     <string name="title_edits">Edits</string>
 
     <string name="dialog_follow_hashtag_title">Follow hashtag</string>
-    <string name="dialog_follow_hashtag_hint">#hashtag</string>
+    <string name="follow_hashtag_success">Followed hashtag %1$s</string>
 
     <string name="post_username_format">\@%1$s</string>
     <string name="post_boosted_format">%1$s boosted</string>
@@ -616,7 +616,7 @@
     <string name="hint_list_name">List name</string>
 
     <string name="add_hashtag_title">Add hashtag</string>
-    <string name="edit_hashtag_hint">Hashtag without #</string>
+    <string name="pick_hashtag_hint">Hashtag without #</string>
     <string name="hashtags">Hashtags</string>
     <string name="select_list_title">Select list</string>
     <string name="select_list_manage">Manage lists</string>