diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index d3329ef8622..e41bd29dfac 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -177,5 +177,6 @@ GLOBAL_LIST_INIT(announcer_keys, list(
 #define SFX_PORTAL_CREATED "portal_created"
 #define SFX_SCREECH "screech"
 #define SFX_TOOL_SWITCH "tool_switch"
+#define SFX_KEYBOARD_CLICKS "keyboard_clicks"
 #define SFX_STONE_DROP "stone_drop"
 #define SFX_STONE_PICKUP "stone_pickup"
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index a1260c6f20f..6fcf4177df4 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -136,6 +136,12 @@
 	. = ..()
 	update_use_power(ACTIVE_POWER_USE)
 
+/obj/machinery/computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+	SHOULD_CALL_PARENT(TRUE)
+	. = ..()
+	if(!issilicon(ui.user))
+		playsound(src, SFX_KEYBOARD_CLICKS, 10, TRUE, FALSE)
+
 /obj/machinery/computer/ui_close(mob/user)
 	SHOULD_CALL_PARENT(TRUE)
 	. = ..()
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 07fa112b39d..2d8fd7e7dca 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -116,7 +116,6 @@
 	if(action == "switch_camera")
 		var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
 		active_camera = selected_camera
-		playsound(src, SFX_TERMINAL_TYPE, 25, FALSE)
 
 		if(isnull(active_camera))
 			return TRUE
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 8c583aeeb79..d48b6297789 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -361,8 +361,7 @@
 				return
 			if (state == STATE_BUYING_SHUTTLE && can_buy_shuttles(user) != TRUE)
 				return
-			set_state(user, params["state"])
-			playsound(src, SFX_TERMINAL_TYPE, 50, FALSE)
+			set_state(usr, params["state"])
 		if ("setStatusMessage")
 			if (!authenticated(user))
 				return
@@ -370,7 +369,6 @@
 			var/line_two = reject_bad_text(params["lowerText"] || "", MAX_STATUS_LINE_LENGTH)
 			post_status("message", line_one, line_two)
 			last_status_display = list(line_one, line_two)
-			playsound(src, SFX_TERMINAL_TYPE, 50, FALSE)
 		if ("setStatusPicture")
 			if (!authenticated(user))
 				return
@@ -385,7 +383,6 @@
 				else
 					post_status("alert", picture)
 
-			playsound(src, SFX_TERMINAL_TYPE, 50, FALSE)
 		if ("toggleAuthentication")
 			// Log out if we're logged in
 			if (authorize_name)
diff --git a/code/game/machinery/computer/records/records.dm b/code/game/machinery/computer/records/records.dm
index e8d8beef854..d5389530043 100644
--- a/code/game/machinery/computer/records/records.dm
+++ b/code/game/machinery/computer/records/records.dm
@@ -100,7 +100,6 @@
 			if(!target)
 				return FALSE
 
-			playsound(src, SFX_TERMINAL_TYPE, 50, TRUE)
 			update_preview(user, params["assigned_view"], target)
 			return TRUE
 
diff --git a/code/game/sound.dm b/code/game/sound.dm
index b579a6215f5..0181bc3d041 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -474,6 +474,16 @@
 			)
 		if(SFX_TOOL_SWITCH)
 			soundin = 'sound/items/handling/tool_switch.ogg'
+		if(SFX_KEYBOARD_CLICKS)
+			soundin = pick(
+				'sound/machines/computer/keyboard_clicks_1.ogg',
+				'sound/machines/computer/keyboard_clicks_2.ogg',
+				'sound/machines/computer/keyboard_clicks_3.ogg',
+				'sound/machines/computer/keyboard_clicks_4.ogg',
+				'sound/machines/computer/keyboard_clicks_5.ogg',
+				'sound/machines/computer/keyboard_clicks_6.ogg',
+				'sound/machines/computer/keyboard_clicks_7.ogg',
+			)
 		if(SFX_STONE_DROP)
 			soundin = pick(
 				'sound/items/stones/stone_drop1.ogg',
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 08bd61945ef..03503ac36d8 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -727,6 +727,8 @@
 	UpdateDisplay()
 
 /obj/item/modular_computer/ui_action_click(mob/user, actiontype)
+	if(!issilicon(user))
+		playsound(src, SFX_KEYBOARD_CLICKS, 10, TRUE, FALSE)
 	if(istype(actiontype, /datum/action/item_action/toggle_computer_light))
 		toggle_flashlight(user)
 		return
diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm
index 126cc889436..ae0eb01b367 100644
--- a/code/modules/wiremod/shell/controller.dm
+++ b/code/modules/wiremod/shell/controller.dm
@@ -53,7 +53,7 @@
 
 /obj/item/circuit_component/controller/proc/handle_trigger(atom/source, user, port_name, datum/port/output/port_signal)
 	source.balloon_alert(user, "clicked [port_name] button")
-	playsound(source, SFX_TERMINAL_TYPE, 25, FALSE)
+	playsound(source, SFX_KEYBOARD_CLICKS, 25, FALSE)
 	entity.set_output(user)
 	port_signal.set_output(COMPONENT_SIGNAL)
 
diff --git a/sound/machines/computer/attribution.txt b/sound/machines/computer/attribution.txt
new file mode 100644
index 00000000000..ab10c922afb
--- /dev/null
+++ b/sound/machines/computer/attribution.txt
@@ -0,0 +1,7 @@
+computer_clicks_1.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_2.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_3.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_4.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_5.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_6.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_7.ogg - made by sadboysuss, license: CC-by-SA
\ No newline at end of file
diff --git a/sound/machines/computer/keyboard_clicks_1.ogg b/sound/machines/computer/keyboard_clicks_1.ogg
new file mode 100644
index 00000000000..b33c6fd56a3
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_1.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_2.ogg b/sound/machines/computer/keyboard_clicks_2.ogg
new file mode 100644
index 00000000000..64d810753c3
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_2.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_3.ogg b/sound/machines/computer/keyboard_clicks_3.ogg
new file mode 100644
index 00000000000..0e1bb3696f1
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_3.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_4.ogg b/sound/machines/computer/keyboard_clicks_4.ogg
new file mode 100644
index 00000000000..b700393a9c3
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_4.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_5.ogg b/sound/machines/computer/keyboard_clicks_5.ogg
new file mode 100644
index 00000000000..d54b211da02
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_5.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_6.ogg b/sound/machines/computer/keyboard_clicks_6.ogg
new file mode 100644
index 00000000000..84ff3bb7f80
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_6.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_7.ogg b/sound/machines/computer/keyboard_clicks_7.ogg
new file mode 100644
index 00000000000..39204e360c9
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_7.ogg differ