diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 70d95673e6..f6ea996107 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,7 +4,24 @@
 frappe.ui.form.on("Document Naming Rule", {
 	refresh: function (frm) {
 		frm.trigger("document_type");
-		if (!frm.doc.__islocal) frm.trigger("add_update_counter_button");
+		frm.last_counter_value = frm.doc.counter;
+		frm.skip_before_save = false;
+	},
+	before_save: function (frm) {
+		if (frm.is_new() || frm.skip_before_save || frm.last_counter_value === frm.doc.counter)
+			return;
+
+		frappe.validated = false;
+		frappe.warn(
+			__("Are you sure?"),
+			__("Updating counter may lead to document name conflicts if not done properly"),
+			() => {
+				frm.skip_before_save = true;
+				frm.save();
+			},
+			__("Proceed"),
+			false
+		);
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames
@@ -26,45 +43,4 @@ frappe.ui.form.on("Document Naming Rule", {
 			});
 		}
 	},
-	add_update_counter_button: (frm) => {
-		frm.add_custom_button(__("Update Counter"), function () {
-			const fields = [
-				{
-					fieldtype: "Data",
-					fieldname: "new_counter",
-					label: __("New Counter"),
-					default: frm.doc.counter,
-					reqd: 1,
-					description: __(
-						"Warning: Updating counter may lead to document name conflicts if not done properly"
-					),
-				},
-			];
-
-			let primary_action_label = __("Save");
-
-			let primary_action = (fields) => {
-				frappe.call({
-					method: "frappe.core.doctype.document_naming_rule.document_naming_rule.update_current",
-					args: {
-						name: frm.doc.name,
-						new_counter: fields.new_counter,
-					},
-					callback: function () {
-						frm.set_value("counter", fields.new_counter);
-						dialog.hide();
-					},
-				});
-			};
-
-			const dialog = new frappe.ui.Dialog({
-				title: __("Update Counter Value for Prefix: {0}", [frm.doc.prefix]),
-				fields,
-				primary_action_label,
-				primary_action,
-			});
-
-			dialog.show();
-		});
-	},
 });
diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.json b/frappe/core/doctype/document_naming_rule/document_naming_rule.json
index 4e6f3f3fd1..1e2247c250 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.json
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.json
@@ -12,8 +12,9 @@
   "conditions",
   "naming_section",
   "prefix",
-  "prefix_digits",
-  "counter"
+  "counter",
+  "column_break_xfqa",
+  "prefix_digits"
  ],
  "fields": [
   {
@@ -22,7 +23,8 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Document Type",
-   "options": "DocType"
+   "options": "DocType",
+   "reqd": 1
   },
   {
    "default": "0",
@@ -38,11 +40,12 @@
    "reqd": 1
   },
   {
+   "default": "0",
+   "description": "Warning: Updating counter may lead to document name conflicts if not done properly",
    "fieldname": "counter",
    "fieldtype": "Int",
    "label": "Counter",
-   "no_copy": 1,
-   "read_only": 1
+   "no_copy": 1
   },
   {
    "default": "5",
@@ -76,11 +79,15 @@
    "fieldname": "priority",
    "fieldtype": "Int",
    "label": "Priority"
+  },
+  {
+   "fieldname": "column_break_xfqa",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-09-13 20:07:47.617615",
+ "modified": "2023-04-24 15:14:32.054272",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Document Naming Rule",
@@ -102,6 +109,7 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "document_type",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.py b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
index 598de98dbb..46bc1c5ee2 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -47,9 +47,3 @@ class DocumentNamingRule(Document):
 
 		doc.name = naming_series + ("%0" + str(self.prefix_digits) + "d") % (counter + 1)
 		frappe.db.set_value(self.doctype, self.name, "counter", counter + 1)
-
-
-@frappe.whitelist()
-def update_current(name, new_counter):
-	frappe.only_for("System Manager")
-	frappe.db.set_value("Document Naming Rule", name, "counter", new_counter)