diff --git a/.changeset/light-hounds-complain.md b/.changeset/light-hounds-complain.md
new file mode 100644
index 0000000000..89570b43fa
--- /dev/null
+++ b/.changeset/light-hounds-complain.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: improve a11y-click-events-have-key-events message
diff --git a/packages/svelte/src/compiler/compile/compiler_warnings.js b/packages/svelte/src/compiler/compile/compiler_warnings.js
index c5d7ca8c5a..c087f192ec 100644
--- a/packages/svelte/src/compiler/compile/compiler_warnings.js
+++ b/packages/svelte/src/compiler/compile/compiler_warnings.js
@@ -271,7 +271,7 @@ export default {
 	a11y_click_events_have_key_events: {
 		code: 'a11y-click-events-have-key-events',
 		message:
-			'A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.'
+			'A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type="button"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.'
 	},
 	a11y_missing_content: /** @param {string} name */ (name) => ({
 		code: 'a11y-missing-content',
diff --git a/packages/svelte/test/validator/samples/a11y-click-events-have-key-events/warnings.json b/packages/svelte/test/validator/samples/a11y-click-events-have-key-events/warnings.json
index f508c12785..38075f740c 100644
--- a/packages/svelte/test/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/packages/svelte/test/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 13,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 15,
 			"column": 0
@@ -25,7 +25,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 18,
 			"column": 0
@@ -37,7 +37,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 20,
 			"column": 0
@@ -49,7 +49,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 22,
 			"column": 0
@@ -61,7 +61,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 24,
 			"column": 0
@@ -73,7 +73,7 @@
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"line": 26,
 			"column": 0
diff --git a/packages/svelte/test/validator/samples/slot-warning/warnings.json b/packages/svelte/test/validator/samples/slot-warning/warnings.json
index 52157ecc45..0d77644f13 100644
--- a/packages/svelte/test/validator/samples/slot-warning/warnings.json
+++ b/packages/svelte/test/validator/samples/slot-warning/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"column": 1,
 			"line": 7
diff --git a/packages/svelte/test/validator/samples/slot-warning2/warnings.json b/packages/svelte/test/validator/samples/slot-warning2/warnings.json
index b6dcf85b97..23504332a1 100644
--- a/packages/svelte/test/validator/samples/slot-warning2/warnings.json
+++ b/packages/svelte/test/validator/samples/slot-warning2/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y-click-events-have-key-events",
-		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
+		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by a keyboard event handler. Consider whether another element might be more appropriate such as a <button type=\"button\"> element for actions or <a> element for navigations. Otherwise, add an on:keydown, on:keyup, or on:keypress event handler.",
 		"start": {
 			"column": 1,
 			"line": 8