diff --git a/app/src/main/java/org/tasks/compose/edit/EditTextView.kt b/app/src/main/java/org/tasks/compose/edit/EditTextView.kt
index fdce69082..1addfc91f 100644
--- a/app/src/main/java/org/tasks/compose/edit/EditTextView.kt
+++ b/app/src/main/java/org/tasks/compose/edit/EditTextView.kt
@@ -39,6 +39,7 @@ fun EditTextView(
     strikethrough: Boolean = false,
     requestFocus: Boolean = false,
     multiline: Boolean = false,
+    onDone: () -> Unit = {},
 ) {
     val context = LocalContext.current
     var shouldRequestFocus by remember { mutableStateOf(false) }
@@ -83,6 +84,7 @@ fun EditTextView(
                             clearFocus()
                             val imm = context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
                             imm.hideSoftInputFromWindow(windowToken, 0)
+                            onDone()
                             true
                         } else {
                             false
diff --git a/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt b/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
index 86669cb1c..c60ce22ed 100644
--- a/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
+++ b/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
@@ -206,6 +206,11 @@ fun TaskEditScreen(
                             },
                             requestFocus = viewState.showKeyboard,
                             multiline = viewState.multilineTitle,
+                            save = {
+                                scope.launch {
+                                    save()
+                                }
+                            },
                         )
                     }
 
diff --git a/app/src/main/java/org/tasks/compose/edit/TitleRow.kt b/app/src/main/java/org/tasks/compose/edit/TitleRow.kt
index c8c819d81..90db1aa2a 100644
--- a/app/src/main/java/org/tasks/compose/edit/TitleRow.kt
+++ b/app/src/main/java/org/tasks/compose/edit/TitleRow.kt
@@ -31,6 +31,7 @@ fun TitleRow(
     onComplete: () -> Unit,
     requestFocus: Boolean,
     multiline: Boolean,
+    save: () -> Unit,
 ) {
     TaskEditRow(
         icon = {
@@ -57,6 +58,7 @@ fun TitleRow(
                     strikethrough = isCompleted,
                     requestFocus = requestFocus,
                     multiline = multiline,
+                    onDone = save,
                 )
                 Spacer(modifier = Modifier.height(11.dp))
             }
@@ -81,6 +83,7 @@ fun EmptyTitlePreview() {
             onComplete = {},
             requestFocus = false,
             multiline = false,
+            save = {},
         )
     }
 }
@@ -106,6 +109,7 @@ fun TitlePreview() {
             onComplete = {},
             requestFocus = false,
             multiline = false,
+            save = {},
         )
     }
 }
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index e8900e95a..20e60a161 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -710,7 +710,6 @@
     <string name="yesterday">Вчера</string>
     <string name="add_shortcut_to_home_screen">Добавяне към началния екран</string>
     <string name="add_widget_to_home_screen">Добавяне на приспособление</string>
-    <string name="multiline_title_off">Натиснете Готово, за да зятворите клавиатурата</string>
     <string name="comment">Коментар</string>
     <string name="multiline_title">Многоредови заглавия</string>
     <string name="cost_more_money">Цена: $$$</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7f3c64910..5c50ac073 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -743,5 +743,4 @@
     <string name="cost_more_money">Cena: $$$</string>
     <string name="multiline_title">Povolit víceřádkové názvy</string>
     <string name="multiline_title_on">Stisknutím Enter přidáte konce řádků</string>
-    <string name="multiline_title_off">Klávesnici zavřete stisknutím tlačítka Hotovo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b56da972e..a06cd87a1 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -682,7 +682,6 @@
     <string name="change_priority">Ændr prioritet</string>
     <string name="repeats_after">Efter</string>
     <string name="repeats_ends">Slutter</string>
-    <string name="multiline_title_off">Tryk på Færdig for at lukke tastaturet</string>
     <string name="sort_grouping">Gruppering</string>
     <string name="repeats_on">På</string>
     <string name="clear_completed_tasks_count">%s vil blive slettet</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7dafcbc16..15e3f5c91 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -710,7 +710,6 @@
     <string name="delete_comment">Kommentar</string>
     <string name="yesterday">Gestern</string>
     <string name="add_shortcut_to_home_screen">Verknüpfung zum Startbildschirm hinzufügen</string>
-    <string name="multiline_title_off">Haken drücken, um Tastatur zu schließen</string>
     <string name="cost_more_money">Kosten: €€€</string>
     <string name="cost_money">Kosten: €</string>
     <string name="cost_free">Kosten: keine</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index b30afe468..685a80b1b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -714,7 +714,6 @@
     <string name="cost_more_money">Kosto: $$$</string>
     <string name="cost_money">Kosto: $</string>
     <string name="comment">Komento</string>
-    <string name="multiline_title_off">Premu Finite por fermi klavaron</string>
     <string name="multiline_title">Permesi pluliniajn titolojn</string>
     <string name="multiline_title_on">Premu enen-klavo por aldoni linisaltojn</string>
     <string name="sync_warning_google_tasks">Iuj detaloj de tasko ne sinkronigos per Google Tasks</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 2af3b2026..3dc591c97 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -591,7 +591,6 @@
     <string name="send_anonymous_statistics">Paranda rakendust Tasks</string>
     <string name="no_app_found">Rakendus ei osanud selle päringuga midagi ette võtta</string>
     <string name="this_feature_requires_a_subscription">See funktsionaalsus eeldab tellimuse olemasolu</string>
-    <string name="multiline_title_off">Klahvistiku sulgemiseks vajuta nuppu „Valmis“</string>
     <string name="repeats_single">Kordub %s</string>
     <string name="repeats_weekly_on">Kordub</string>
     <string name="repeats_on">Kordub</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5d6b6bfb9..5e3e3a97b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -733,7 +733,6 @@
     <string name="add_shortcut_to_home_screen">Ajouter le raccourci à l\'écran d\'accueil</string>
     <string name="multiline_title">Permettre des titres sur plusieurs lignes</string>
     <string name="multiline_title_on">Appuyer sur la touche Entrée pour ajouter des sauts de ligne</string>
-    <string name="multiline_title_off">Appuyer sur Terminé pour fermer le clavier</string>
     <string name="comment">Commentaire</string>
     <string name="delete_comment">commentaire</string>
     <string name="yesterday">Hier</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 0dbe9df8a..472877ef7 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -731,7 +731,6 @@
     <string name="cost_more_money">Cijena: $$$</string>
     <string name="multiline_title">Dozvoli višeredne naslove</string>
     <string name="multiline_title_on">Pritisni tipku Enter za dodavanje prijeloma retka</string>
-    <string name="multiline_title_off">Pritisni „Gotovo” za zatvaranje tipkovnice</string>
     <string name="sync_warning_microsoft_title">O sinkronizaciji s Microsoft To Do</string>
     <string name="sync_warning_google_tasks_title">O sinkronizaciji s Google Tasks</string>
     <string name="button_learn_more">Saznaj više</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0986dc7c9..6acc60a03 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -709,7 +709,6 @@
     <string name="cost_more_money">Ár: $$$</string>
     <string name="multiline_title">Többsoros címek engedélyezése</string>
     <string name="multiline_title_on">Sortöréshez nyomd meg az Enter-t</string>
-    <string name="multiline_title_off">Nyomd meg a Done-t a billentyűzet bezárásához</string>
     <string name="delete_comment">megjegyzés</string>
     <string name="comment">Megjegyzés</string>
     <string name="yesterday">Tegnap</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e37d707ce..52d2f1d10 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -736,7 +736,6 @@
     <string name="cost_free">Costo: gratuito</string>
     <string name="multiline_title">Consenti titoli su più linee</string>
     <string name="multiline_title_on">Premi invio per aggiungere una interruzioni di riga</string>
-    <string name="multiline_title_off">Premi il segno di spunta per chiudere la tastiera</string>
     <string name="cost_more_money">Costo: $$$</string>
     <string name="cost_money">Costo: $</string>
     <string name="sync_warning_google_tasks">Non tutti i dettagli delle attività saranno sincronizzati con Google Tasks</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a29aa110f..26f475c79 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -689,7 +689,6 @@
     <string name="show_edit_screen_without_unlock">ロック時に編集画面を表示</string>
     <string name="send_application_logs">アプリケーションのログを送信</string>
     <string name="show_edit_screen_without_unlock_summary">デバイスのロックを解除せずにクイック設定タイルを利用可能に</string>
-    <string name="multiline_title_off">完了を押してキーボードをしまう</string>
     <string name="add_shortcut_to_home_screen">ホーム画面にショートカットを追加</string>
     <string name="add_widget_to_home_screen">ホーム画面にウィジェットを追加</string>
     <string name="theme_dynamic">ダイナミック</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 000b4f3c6..91b2bdcbb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -704,7 +704,6 @@
     <string name="quiet_hours_in_effect">Rusttijd staat aan</string>
     <string name="add_widget_to_home_screen">Widget aan startscherm toevoegen</string>
     <string name="add_shortcut_to_home_screen">Snelkoppeling aan startscherm toevoegen</string>
-    <string name="multiline_title_off">Druk op Klaar om het toetsenbord te sluiten</string>
     <string name="yesterday">Gisteren</string>
     <string name="cost_free">Kosten: gratis</string>
     <string name="cost_money">Kosten: €</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index caa3c0f74..0e1f58028 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -743,7 +743,6 @@
     <string name="add_shortcut_to_home_screen">Adicionar atalho à tela inicial</string>
     <string name="add_widget_to_home_screen">Adicionar Widget à tela inicial</string>
     <string name="multiline_title">Permitir títulos com múltiplas linhas</string>
-    <string name="multiline_title_off">Pressione \'Concluir\' para fechar o teclado</string>
     <string name="sync_warning_microsoft_title">Sobre a sincronização do Microsoft To Do</string>
     <string name="send_application_logs">Enviar registros do aplicativo</string>
     <string name="banner_app_updated_title">Aplicativo atualizado</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 011376111..9066100a7 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -731,7 +731,6 @@
     <string name="comment">Comentariu</string>
     <string name="quiet_hours_in_effect">Orele liniștite sunt activate</string>
     <string name="cost_free">Preț: Gratuit</string>
-    <string name="multiline_title_off">Apasă Finalizare pentru a închide tastatura</string>
     <string name="price_per_month_with_currency">%s/lună</string>
     <string name="price_per_year_with_currency">%s/an</string>
     <string name="add_widget_to_home_screen">Adaugă widget pe ecranul de pornire</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 16eb7d136..8c28775fc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -742,7 +742,6 @@
     <string name="cost_money">Цена: $</string>
     <string name="cost_more_money">Цена: $$$</string>
     <string name="multiline_title_on">Нажмите Enter чтобы перейти на новую строку</string>
-    <string name="multiline_title_off">Нажмите Done, чтобы закрыть клавиатуру</string>
     <string name="donate_nag">Выразите свою поддержку с помощью пожертвования!</string>
     <string name="theme_dynamic">Динамическая</string>
     <string name="subtasks_multilevel_microsoft">Многоуровневые подзадачи не поддерживаются Microsoft To Do</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 5cc2fbe03..9251a7ab9 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -719,7 +719,6 @@
     <string name="consent_deny">Teraz nie</string>
     <string name="hint_customize_edit_body">Túto obrazovku si môžete prispôsobiť preskupením alebo odobraním polí</string>
     <string name="add_widget_to_home_screen">Pridať widget na domovskú obrazovku</string>
-    <string name="multiline_title_off">Klávesnicu zavriete stlačením tlačidla Hotovo</string>
     <string name="remove_user_confirmation">%1$s už nebude mať prístup k %2$s</string>
     <string name="invite_awaiting_response">Pozvánka čaká na odpoveď</string>
     <string name="invite_declined">Pozvánka bola odmietnutá</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b0a130f2e..e9187c325 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -711,7 +711,6 @@
     <string name="cost_free">Pris: Gratis</string>
     <string name="cost_money">Pris: $</string>
     <string name="cost_more_money">Pris: $$$</string>
-    <string name="multiline_title_off">Tryck Färdig för att stänga skärmtangentbordet</string>
     <string name="add_shortcut_to_home_screen">Lägg till genväg på hemskärm</string>
     <string name="multiline_title">Tillåt flerradsrubriker</string>
     <string name="multiline_title_on">Tryck Enter för att lägga till radbrytningar</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 49d5b1284..d45496181 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -719,7 +719,6 @@
     <string name="add_shortcut_to_home_screen">முகப்புத் திரையில் குறுக்குவழியைச் சேர்க்கவும்</string>
     <string name="add_widget_to_home_screen">முகப்புத் திரையில் விட்செட்டைச் சேர்க்கவும்</string>
     <string name="cost_free">செலவு: இலவசம்</string>
-    <string name="multiline_title_off">விசைப்பலகை மூட முடிந்தது</string>
     <string name="button_learn_more">மேலும் அறிக</string>
     <string name="open_source">திறந்த மூல</string>
     <string name="google_play_subscribers">கூகிள் பிளே சந்தாதாரர்கள்</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3c02b1b2f..536a98f91 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -721,7 +721,6 @@
     <string name="cost_more_money">Ücret: $$$</string>
     <string name="multiline_title">Çok satırlı başlıklara izin ver</string>
     <string name="multiline_title_on">Satır eklemek için Enter tuşuna bas</string>
-    <string name="multiline_title_off">Klavyeyi kapatmak için Bitti\'ye bas</string>
     <string name="subtasks_multilevel_microsoft">Microsoft To Do, çok düzeyli alt görevleri desteklemez</string>
     <string name="app_settings">Uygulama ayarları</string>
     <string name="banner_app_updated_description">Tasks %s sürümüne güncellendi. Dağıtım notlarını görmek ister misiniz?</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9e9585dbc..ff5bc9180 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -740,7 +740,6 @@
     <string name="cost_more_money">Вартість: $$$</string>
     <string name="multiline_title">Дозволити багаторядкові заголовки</string>
     <string name="multiline_title_on">Натисніть Enter, щоб перенести рядок</string>
-    <string name="multiline_title_off">Натисніть Готово, щоб закрити клавіатуру</string>
     <string name="sync_warning_microsoft">Не всі відомості про завдання синхронізуються з Microsoft To Do.</string>
     <string name="sync_warning_google_tasks_title">Про синхронізацію з Google Task</string>
     <string name="sync_warning_microsoft_title">Про синхронізацію з Microsoft To Do</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8015fc63d..87f95b3e5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -702,7 +702,6 @@
     <string name="cost_more_money">费用：$$$</string>
     <string name="cost_free">费用：无</string>
     <string name="cost_money">费用：$</string>
-    <string name="multiline_title_off">按完成关闭键盘</string>
     <string name="comment">注释</string>
     <string name="multiline_title">允许多行标题</string>
     <string name="multiline_title_on">按 Enter 键添加换行符</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 644e86c66..1f34a65b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -725,7 +725,7 @@ File %1$s contained %2$s.\n\n
   <string name="cost_more_money">Cost: $$$</string>
   <string name="multiline_title">Allow multiline titles</string>
   <string name="multiline_title_on">Press Enter key to add line breaks</string>
-  <string name="multiline_title_off">Press Done to close keyboard</string>
+  <string name="multiline_title_off">Press Done to save task</string>
   <string name="sync_warning_microsoft_title">About Microsoft To Do sync</string>
   <string name="sync_warning_microsoft">Not all task details sync with Microsoft To Do.</string>
   <string name="sync_warning_google_tasks_title">About Google Task sync</string>