diff --git a/.changeset/popular-dolphins-shake.md b/.changeset/popular-dolphins-shake.md
new file mode 100644
index 0000000000..1866a05492
--- /dev/null
+++ b/.changeset/popular-dolphins-shake.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better migration for leading and trailing comments
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index 42727ea212..06d551b7c8 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -549,6 +549,25 @@ const instance_script = {
 					labeled_statement &&
 					(labeled_has_single_assignment || is_expression_assignment)
 				) {
+					const indent = state.str.original.substring(
+						state.str.original.lastIndexOf('\n', /** @type {number} */ (node.start)) + 1,
+						/** @type {number} */ (node.start)
+					);
+					// transfer all the leading comments
+					if (
+						labeled_statement.body.type === 'BlockStatement' &&
+						labeled_statement.body.body[0].leadingComments
+					) {
+						for (let comment of labeled_statement.body.body[0].leadingComments) {
+							state.str.prependLeft(
+								/** @type {number} */ (node.start),
+								comment.type === 'Block'
+									? `/*${comment.value}*/\n${indent}`
+									: `// ${comment.value}\n${indent}`
+							);
+						}
+					}
+
 					// Someone wrote a `$: { ... }` statement which we can turn into a `$derived`
 					state.str.appendRight(
 						/** @type {number} */ (declarator.id.typeAnnotation?.end ?? declarator.id.end),
@@ -573,6 +592,21 @@ const instance_script = {
 						')'
 					);
 					state.derived_labeled_statements.add(labeled_statement);
+
+					// transfer all the trailing comments
+					if (
+						labeled_statement.body.type === 'BlockStatement' &&
+						labeled_statement.body.body[0].trailingComments
+					) {
+						for (let comment of labeled_statement.body.body[0].trailingComments) {
+							state.str.appendRight(
+								/** @type {number} */ (declarator.id.typeAnnotation?.end ?? declarator.id.end),
+								comment.type === 'Block'
+									? `\n${indent}/*${comment.value}*/`
+									: `\n${indent}// ${comment.value}`
+							);
+						}
+					}
 				} else {
 					state.str.prependLeft(
 						/** @type {number} */ (declarator.id.typeAnnotation?.end ?? declarator.id.end),
@@ -1261,11 +1295,18 @@ function handle_events(element, state) {
  * Returns start and end of the node. If the start is preceeded with white-space-only before a line break,
  * the start will be the start of the line.
  * @param {string} source
- * @param {Node} node
+ * @param {LabeledStatement} node
  */
 function get_node_range(source, node) {
-	let start = /** @type {number} */ (node.start);
-	let end = /** @type {number} */ (node.end);
+	const first_leading_comment = node.leadingComments?.[0];
+	const last_trailing_comment = node.trailingComments?.[node.trailingComments.length - 1];
+
+	// @ts-expect-error the type of `Comment` seems to be wrong...the node actually contains
+	// start and end but the type seems to only contain a `range` (which doesn't actually exists)
+	let start = /** @type {number} */ (first_leading_comment?.start ?? node.start);
+	// @ts-expect-error the type of `Comment` seems to be wrong...the node actually contains
+	// start and end but the type seems to only contain a `range` (which doesn't actually exists)
+	let end = /** @type {number} */ (last_trailing_comment?.end ?? node.end);
 
 	let idx = start;
 	while (source[idx - 1] !== '\n' && source[idx - 1] !== '\r') {
diff --git a/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/input.svelte b/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/input.svelte
new file mode 100644
index 0000000000..78c7a6b124
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/input.svelte
@@ -0,0 +1,27 @@
+<script>
+	let count = 0;
+
+	$: {
+		console.log({ count, double });
+	}
+
+	// this comment should remain attached to this declaration after migration
+	$: double = count * 2; // this too
+
+	// triple
+	let triple;
+	$: {
+		// update triple
+		triple = count * 3;
+		// trailing comment
+		// in triple
+	}
+
+	function increment() {
+		count += 1;
+	}
+</script>
+
+<button onclick={increment}>
+	clicks: {count}
+</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/output.svelte b/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/output.svelte
new file mode 100644
index 0000000000..48a3378d51
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/reactive-statements-reorder-with-comments/output.svelte
@@ -0,0 +1,27 @@
+<script>
+	import { run } from 'svelte/legacy';
+
+	let count = $state(0);
+
+
+
+	// triple
+	//  update triple
+	let triple = $derived(count * 3)
+	//  trailing comment
+	//  in triple;
+
+	function increment() {
+		count += 1;
+	}
+	// this comment should remain attached to this declaration after migration
+	let double = $derived(count * 2); // this too
+	run(() => {
+		console.log({ count, double });
+	});
+	
+</script>
+
+<button onclick={increment}>
+	clicks: {count}
+</button>
\ No newline at end of file