diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 71996d088c4..9e1b4533e95 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -71,7 +71,7 @@
 			ui.add_template("mapContent", "sec_camera_map_content.tmpl")
 			// adding a template with the key "mapHeader" replaces the map header content
 			ui.add_template("mapHeader", "sec_camera_map_header.tmpl")
-			
+
 			ui.set_initial_data(data)
 			ui.open()
 			ui.set_auto_update(1)
@@ -102,6 +102,7 @@
 
 		if(!isAI(user))
 			user.set_machine(src)
+			usr.reset_view(current)
 		ui_interact(user)
 
 	proc/can_access_camera(var/obj/machinery/camera/C)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 46450071afb..b2e6e6a505b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -697,7 +697,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				mode=2
 
 		if("Ringtone")
-			var/t = input(U, "Please enter new ringtone", name, ttone) as text
+			var/t = input(U, "Please enter new ringtone", name, ttone) as text|null
 			if (in_range(src, U) && loc == U)
 				if (t)
 					if(src.hidden_uplink && hidden_uplink.check_trigger(U, lowertext(t), lowertext(lock_code)))
@@ -710,7 +710,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				ui.close()
 				return 0
 		if("Newstone")
-			var/t = input(U, "Please enter new news tone", name, newstone) as text
+			var/t = input(U, "Please enter new news tone", name, newstone) as text|null
 			if (in_range(src, U) && loc == U)
 				if (t)
 					t = sanitize(t, 20)
@@ -950,7 +950,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(tap)
 		U.visible_message("<span class='notice'>[U] taps on \his PDA's screen.</span>")
 	U.last_target_click = world.time
-	var/t = input(U, "Please enter message", P.name, null) as text
+	var/t = input(U, "Please enter message", P.name, null) as text|null
 	t = sanitize(t)
 	//t = readd_quotes(t)
 	t = replace_characters(t, list("&#34;" = "\""))
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 22d392cfa2c..53d68def64f 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -35,7 +35,7 @@ mob/var/obj/effect/decal/typing_indicator
 
 	set_typing_indicator(1)
 	hud_typing = 1
-	var/message = input("","say (text)") as text
+	var/message = input("","say (text)") as text|null
 	hud_typing = 0
 	set_typing_indicator(0)
 	if(message)
@@ -47,7 +47,7 @@ mob/var/obj/effect/decal/typing_indicator
 
 	set_typing_indicator(1)
 	hud_typing = 1
-	var/message = input("","me (text)") as text
+	var/message = input("","me (text)") as text|null
 	hud_typing = 0
 	set_typing_indicator(0)
 	if(message)
diff --git a/html/changelogs/Nanako-CamCancel.yml b/html/changelogs/Nanako-CamCancel.yml
new file mode 100644
index 00000000000..1af83d794fe
--- /dev/null
+++ b/html/changelogs/Nanako-CamCancel.yml
@@ -0,0 +1,39 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Nanako
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixed an exploit where security cam consoles could give xray vision"
+  - tweak: "Added cancel buttons to several input dialogs, including say, me, and PDA messaging"
+
+  
\ No newline at end of file