diff --git a/public/js/startup.js b/public/js/startup.js
index 69151bef292..10c9791956b 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -151,7 +151,7 @@ erpnext.setup_mousetrap = function() {
 	});
 
 	Mousetrap.bind(["command+s", "ctrl+s"], function() {
-		if(cur_frm)
+		if(cur_frm && !cur_frm.save_disabled)
 			cur_frm.save();
 		else if(wn.container.page.save_action)
 			wn.container.page.save_action();
diff --git a/setup/doctype/permission_control/permission_control.py b/setup/doctype/permission_control/permission_control.py
index 8162c39c566..cb0575d938d 100644
--- a/setup/doctype/permission_control/permission_control.py
+++ b/setup/doctype/permission_control/permission_control.py
@@ -51,7 +51,7 @@ class DocType:
 	# -------------------------------------------------------------------
 	def get_permissions(self,doctype):
 		import webnotes.model.doctype
-		doclist = webnotes.model.doctype.get(doctype)
+		doclist = webnotes.model.doctype.get(doctype).get_parent_doclist()
 		
 		ptype = [{
 				'role': perm.role,