diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py
index 460b7cced0..447cfbd019 100644
--- a/frappe/model/workflow.py
+++ b/frappe/model/workflow.py
@@ -130,6 +130,13 @@ def apply_workflow(doc, action):
 	if doc.docstatus.is_draft() and new_docstatus == DocStatus.draft():
 		doc.save()
 	elif doc.docstatus.is_draft() and new_docstatus == DocStatus.submitted():
+		from frappe.core.doctype.submission_queue.submission_queue import queue_submission
+		from frappe.utils.scheduler import is_scheduler_inactive
+
+		if doc.meta.queue_in_background and not is_scheduler_inactive():
+			queue_submission(doc, "Submit")
+			return
+
 		doc.submit()
 	elif doc.docstatus.is_submitted() and new_docstatus == DocStatus.submitted():
 		doc.save()
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 466754261e..21f7432a7a 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1479,14 +1479,6 @@ frappe.ui.form.Form = class FrappeForm {
 
 		let btn = this.page.add_inner_button(label, fn, group);
 
-		if (btn) {
-			// Add actions as menu item in Mobile View
-			let menu_item_label = group ? `${group} > ${label}` : label;
-			let menu_item = this.page.add_menu_item(menu_item_label, fn, false);
-			menu_item.parent().addClass("hidden-xl");
-
-			this.custom_buttons[label] = btn;
-		}
 		return btn;
 	}