diff --git a/app/blueprints/packages/reviews.py b/app/blueprints/packages/reviews.py
index 3916a59a..5907159f 100644
--- a/app/blueprints/packages/reviews.py
+++ b/app/blueprints/packages/reviews.py
@@ -45,7 +45,7 @@ class ReviewForm(FlaskForm):
 	comment = TextAreaField(lazy_gettext("Comment"), [InputRequired(), Length(10, 2000)])
 	rating = RadioField(lazy_gettext("Rating"), [InputRequired()],
 			choices=[("5", lazy_gettext("Yes")), ("3", lazy_gettext("Neutral")), ("1", lazy_gettext("No"))])
-	submit  = SubmitField(lazy_gettext("Save"))
+	btn_submit = SubmitField(lazy_gettext("Save"))
 
 
 @bp.route("/packages/<author>/<name>/review/", methods=["GET", "POST"])
diff --git a/app/templates/packages/review_create_edit.html b/app/templates/packages/review_create_edit.html
index 994d2736..23536946 100644
--- a/app/templates/packages/review_create_edit.html
+++ b/app/templates/packages/review_create_edit.html
@@ -42,8 +42,8 @@
 					</p>
 
 					{{ render_field(form.title) }}
-					{{ render_field(form.comment, label="", class_="m-0", fieldclass="form-control markdown") }} <br />
-					{{ render_submit_field(form.submit) }}
+					{{ render_field(form.comment, label="", class_="m-0", fieldclass="form-control markdown", data_enter_submit="1") }} <br />
+					{{ render_submit_field(form.btn_submit) }}
 				</div>
 			</div>
 		</div>