diff --git a/lms/www/batch/edit.html b/lms/www/batch/edit.html
index 312e060f..b75ddbe1 100644
--- a/lms/www/batch/edit.html
+++ b/lms/www/batch/edit.html
@@ -70,7 +70,7 @@
             {{ _("Title") }}
         </div>
         <div class="">
-            <input id="lesson-title" type="text" class="field-input" data-index="{{ lesson_index }}" data-chapter="{{ chapter }}" data-course="{{ course.name }}" {% if lesson.name %} data-lesson="{{ lesson.name }}"  value="{{ lesson.title }}" {% endif %}>
+            <input id="lesson-title" type="text" class="field-input" data-index="{{ lesson_index }}" data-chapter="{{ chapter | urlencode }}" data-course="{{ course.name }}" {% if lesson.name %} data-lesson="{{ lesson.name }}"  value="{{ lesson.title }}" {% endif %}>
         </div>
     </div>
 
diff --git a/lms/www/batch/edit.js b/lms/www/batch/edit.js
index 13010356..d9e2d892 100644
--- a/lms/www/batch/edit.js
+++ b/lms/www/batch/edit.js
@@ -234,7 +234,7 @@ const save = () => {
 		args: {
 			title: $("#lesson-title").val(),
 			body: this.lesson_content_data,
-			chapter: $("#lesson-title").data("chapter"),
+			chapter: decodeURIComponent($("#lesson-title").data("chapter")),
 			preview: $("#preview").prop("checked") ? 1 : 0,
 			idx: $("#lesson-title").data("index"),
 			lesson: lesson ? lesson : "",