diff --git a/resources/js/src/entrypoints/Tasks.svelte b/resources/js/src/entrypoints/Tasks.svelte
index 12ae496..775a752 100644
--- a/resources/js/src/entrypoints/Tasks.svelte
+++ b/resources/js/src/entrypoints/Tasks.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { flip } from 'svelte/animate';
 	import { fade } from 'svelte/transition';
-
 	import {
 		getTasks,
 		getTags,
@@ -124,14 +123,21 @@
 		}
 
 		try {
-			await updateTask(
+			selectedTask = await updateTask(
 				selectedTask,
 				{
 					description: selectedTaskDescription,
 					details: selectedTaskDetails,
 				},
-				selectedTaskTags.split(', '),
+				selectedTaskTags
+					.split(',')
+					.map((t) => t.trim())
+					.filter((t) => t !== ''),
 			);
+
+			// The description and details should already be up-to-date, but we might
+			// have to refresh the tags.
+			selectedTaskTags = selectedTask.tags?.map((t) => t.name).join(', ') ?? '';
 		} catch (e) {
 			console.error(e);
 		} finally {
diff --git a/routes/api.php b/routes/api.php
index 870077b..18aca61 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -90,7 +90,10 @@
         $task->tags()->save( $tag );
     }
 
-	return $task;
+    return Task::with('tags')
+        ->where('user_id', $request->user()->id)
+        ->where('id', $task->id)
+        ->first();
 })->middleware('auth:sanctum');
 
 Route::patch('/tasks/move/{id}', function (Request $request, string $id) {