diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34af2094..b76d08c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Improvements
 - Add the "desc" field (check's description) to API responses
+- Add maxlength attribute to HTML input=text elements
 
 ### Bug Fixes
 - Fix refreshing of the checks page filtered by tags (#221)
diff --git a/templates/front/channels.html b/templates/front/channels.html
index 8fa1ae05..0064984e 100644
--- a/templates/front/channels.html
+++ b/templates/front/channels.html
@@ -358,6 +358,7 @@
                             <input
                                 name="name"
                                 type="text"
+                                maxlength="100"
                                 value="{{ ch.name }}"
                                 placeholder="{{ ch }}"
                                 class="input-name form-control" />
diff --git a/templates/front/update_name_modal.html b/templates/front/update_name_modal.html
index c21fc023..52dca802 100644
--- a/templates/front/update_name_modal.html
+++ b/templates/front/update_name_modal.html
@@ -21,6 +21,7 @@
                                 id="update-name-input"
                                 name="name"
                                 type="text"
+                                maxlength="100"
                                 value="{{ check.name }}"
                                 placeholder="unnamed"
                                 class="input-name form-control" />
@@ -41,6 +42,7 @@
                                 id="update-tags-input"
                                 name="tags"
                                 type="text"
+                                maxlength="500"
                                 value="{{ check.tags }}"
                                 placeholder="production www"
                                 class="form-control" />