diff --git a/frappe/core/doctype/submission_queue/submission_queue.py b/frappe/core/doctype/submission_queue/submission_queue.py
index db95228463..40e50b1f4b 100644
--- a/frappe/core/doctype/submission_queue/submission_queue.py
+++ b/frappe/core/doctype/submission_queue/submission_queue.py
@@ -74,7 +74,7 @@ class SubmissionQueue(Document):
 			message = _("Submission of {0} {1} with action {2} completed successfully")
 
 		notification_doc = {
-			"type": "Mention",
+			"type": "Alert",
 			"document_type": doctype,
 			"document_name": docname,
 			"subject": message.format(
@@ -128,6 +128,12 @@ class SubmissionQueue(Document):
 
 
 def queue_submission(doc: Document, action: str):
+	# Allowing only submittable doctypes to be queued
+
+	if not doc.meta.is_submittable:
+		getattr(doc, action.lower())()
+		return
+
 	queue = frappe.new_doc("Submission Queue")
 	queue.state = "Queued"
 	queue.enqueued_by = frappe.session.user
diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py
index 949de9e7aa..8ea5b120e6 100644
--- a/frappe/desk/form/save.py
+++ b/frappe/desk/form/save.py
@@ -22,7 +22,6 @@ def savedocs(doc, action):
 		if (
 			action == "Submit"
 			and doc.meta.queue_in_background
-			and doc.meta.is_submittable
 			and not is_scheduler_inactive()
 		):
 			queue_submission(doc, action)