diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 76dc3dee8e..cd3477c568 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -629,6 +629,8 @@ frappe.ui.form.GridRow = Class.extend({
 		}
 	},
 	render_template: function() {
+		this.set_row_index();
+		
 		if(this.row_display) {
 			this.row_display.remove();
 		}