diff --git a/app/portal/onion.py b/app/portal/onion.py
index 8d6b4cf..037db8d 100644
--- a/app/portal/onion.py
+++ b/app/portal/onion.py
@@ -34,13 +34,13 @@ class NewOnionForm(FlaskForm):  # type: ignore
 
 
 class EditOnionForm(FlaskForm):  # type: ignore
-    description = StringField('Description', validators=[DataRequired()])
-    group = SelectField('Group', validators=[DataRequired()])
     domain_name = StringField('Domain Name', validators=[DataRequired()])
+    description = StringField('Description', validators=[DataRequired()])
     tls_private_key = FileField('TLS Private Key (PEM format)',
                                 description="If no file is submitted, the TLS key will remain unchanged.")
     tls_public_key = FileField('TLS Certificate (PEM format)',
                                description="If no file is submitted, the TLS certificate will remain unchanged.")
+    group = SelectField('Group', validators=[DataRequired()])
     submit = SubmitField('Save Changes')
 
 
@@ -89,6 +89,7 @@ def onion_edit(onion_id: int) -> ResponseReturnValue:
                                         message="The requested onion service could not be found."),
                         status=404)
     form = EditOnionForm(group=onion.group_id,
+                         domain_name=onion.domain_name,
                          description=onion.description)
     form.group.choices = [(x.id, x.group_name) for x in Group.query.all()]
     if form.validate_on_submit():