diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm
index 5baf7a73a40..f3b5a9659b2 100644
--- a/code/modules/modular_computers/file_system/computer_file.dm
+++ b/code/modules/modular_computers/file_system/computer_file.dm
@@ -40,12 +40,11 @@ var/global/file_uid = 0
 	temp.password = password
 	return temp
 
-/datum/computer_file/proc/can_access_file(var/mob/user, input_password = "")
+/datum/computer_file/proc/can_access_file(mob/user, input_password = "")
 	if(!password)
 		return TRUE
-	else if(!input_password)
+	if(!input_password)
 		input_password = sanitize(input(user, "Please enter a password to access file '[filename]':"))
 	if(input_password == password)
 		return TRUE
-	else
-		return FALSE
\ No newline at end of file
+	return FALSE
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
index deda1b48e43..373660438c8 100644
--- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
@@ -86,12 +86,9 @@
 		if("PRG_openfile")
 			. = 1
 			var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
-			if(!F)
-				return
-			if(F.can_access_file(usr))
-				open_file = href_list["PRG_openfile"]
-			else
+			if(!F.can_access_file(usr))
 				return
+			open_file = href_list["PRG_openfile"]
 		if("PRG_newtextfile")
 			. = 1
 			var/newname = stripped_input(usr, "Enter file name or leave blank to cancel:", "File rename", max_length=50)
@@ -215,7 +212,11 @@
 				return 1
 			if(F.password)
 				return
-			F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
+			var/new_password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
+			if(!new_password)
+				to_chat(usr, "<span class='warning'>File not encrypted.</span>")
+				return
+			F.password=new_password
 		if("PRG_decrypt")
 			. = 1
 			if(!HDD)
diff --git a/nano/templates/file_manager.tmpl b/nano/templates/file_manager.tmpl
index 3743c6db7d0..5e51c221bb2 100644
--- a/nano/templates/file_manager.tmpl
+++ b/nano/templates/file_manager.tmpl
@@ -35,9 +35,9 @@
 							{{if data.usbconnected}}
 								{{:helper.link('EXPORT', 'upload', {'action' : 'PRG_copytousb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}}
 							{{if !value.encrypted}}
-								{{:helper.link('ENCRYPT', null, { "PRG_encrypt" : value.name }, (value.undeletable) ? 'disabled' : null)}}
+								{{:helper.link('ENCRYPT', null, { 'PRG_encrypt' : value.name }, (value.undeletable) ? 'disabled' : null)}}
 							{{else}}
-								{{:helper.link('DECRYPT', null, { "PRG_decrypt" : value.name }, (value.undeletable) ? 'disabled' : null)}}
+								{{:helper.link('DECRYPT', null, { 'PRG_decrypt' : value.name }, (value.undeletable) ? 'disabled' : null)}}
 							{{/if}}
 							{{if data.usbconnected}}
 								{{:helper.link('EXPORT', 'upload', {'action' : 'PRG_copytousb', 'name' : value.name}, value.undeletable ? 'disabled' : null)}}