diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 99907af47a..738d72c6bf 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -69,9 +69,6 @@
 		return
 	next_click = world.time + world.tick_lag
 
-	// Hide typing indicator if we click
-	clear_typing_indicator()
-
 	if(check_click_intercept(params,A))
 		return
 
@@ -80,7 +77,7 @@
 
 	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
 		return
-		
+
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"] && modifiers["middle"])
 		ShiftMiddleClickOn(A)
diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index c6c03e2cbd..1f8a03b3e7 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -33,11 +33,11 @@ SUBSYSTEM_DEF(input)
 			"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
 			"O" = "ooc",
 			"Ctrl+O" = "looc",
-			"T" = "Say",
-			"Ctrl+T" = "SayWithIndicator",
+			"T" = "say",
+			"Ctrl+T" = "say_indicator",
 			"Y" = "whisper",
-			"M" = "Me",
-			"Ctrl+M" = "MeWithIndicator",
+			"M" = "me",
+			"Ctrl+M" = "me_indicator",
 			"5" = "subtle",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -45,17 +45,17 @@ SUBSYSTEM_DEF(input)
 			),
 		"old_default" = list(
 			"Tab" = "\".winset \\\"mainwindow.macro=old_hotkeys map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"",
-			"Ctrl+T" = "Say",
+			"Ctrl+T" = "say",
 			"Ctrl+O" = "ooc",
 			),
 		"old_hotkeys" = list(
 			"Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
 			"O" = "ooc",
 			"L" = "looc",
-			"T" = "Say",
-			"Ctrl+T" = "SayWithIndicator",
-			"M" = "Me",
-			"Ctrl+M" = "MeWithIndicator",
+			"T" = "say",
+			"Ctrl+T" = "say_indicator",
+			"M" = "me",
+			"Ctrl+M" = "me_indicator",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
 			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 9679417ed8..ac89fc2445 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -1,11 +1,11 @@
 //Speech verbs.
 // the _keybind verbs uses "as text" versus "as text|null" to force a popup when pressed by a keybind.
 /mob/verb/say_typing_indicator()
-	set name = "SayWithIndicator"
+	set name = "say_indicator"
 	set hidden = TRUE
 	set category = "IC"
 	display_typing_indicator()
-	var/message = input(usr, "", "Say") as text|null
+	var/message = input(usr, "", "say") as text|null
 	// If they don't type anything just drop the message.
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
@@ -13,7 +13,7 @@
 	return say_verb(message)
 
 /mob/verb/say_verb(message as text)
-	set name = "Say"
+	set name = "say"
 	set category = "IC"
 	if(!length(message))
 		return
@@ -24,11 +24,11 @@
 	say(message)
 
 /mob/verb/me_typing_indicator()
-	set name = "MeWithIndicator"
+	set name = "me_indicator"
 	set hidden = TRUE
 	set category = "IC"
 	display_typing_indicator()
-	var/message = input(usr, "", "Me") as message|null
+	var/message = input(usr, "", "me") as message|null
 	// If they don't type anything just drop the message.
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
@@ -36,9 +36,8 @@
 	return me_verb(message)
 
 /mob/verb/me_verb(message as message)
-	set name = "Me"
+	set name = "me"
 	set category = "IC"
-	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
@@ -46,6 +45,7 @@
 		return
 
 	message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
+	clear_typing_indicator()		// clear it immediately!
 
 	usr.emote("me",1,message,TRUE)