diff --git a/djblets/configforms/templates/configforms/config.html b/djblets/configforms/templates/configforms/config.html
index 355f8abc9fe94ac2898bb5f75c83f6d0a1f6f4ac..2a966f4b28acac38c63bbcd0c530ee0cadc377e7 100644
--- a/djblets/configforms/templates/configforms/config.html
+++ b/djblets/configforms/templates/configforms/config.html
@@ -6,8 +6,10 @@
 {% block content %}
 <div class="config-forms-container"{% if pages_id %} id="{{pages_id}}"{% endif %}>
 {%  box "nav config-forms-side-nav" %}
- <h1 class="title">{{nav_title}}</h1>
- <div class="main">
+ <div class="box-head">
+  <h1 class="box-title">{{nav_title}}</h1>
+ </div>
+ <div class="box-main">
   <ul>
 {%   for page in pages %}
 {%    if page.is_visible %}
diff --git a/djblets/configforms/templates/configforms/config_page.html b/djblets/configforms/templates/configforms/config_page.html
index 1660dd02cec26d2e000191d33e5407f1c97a3de6..312e39688e7987ebaae91d934ac57ee49bb3fb75 100644
--- a/djblets/configforms/templates/configforms/config_page.html
+++ b/djblets/configforms/templates/configforms/config_page.html
@@ -2,9 +2,9 @@
 
 {% for form in page.forms %}
 {%  box %}
-<h1 class="title">{{form.form_title}}</h1>
-<div class="main">
- <form method="post" action=".#{{page.page_id}}" id="form_{{form.form_id}}">
+<h1 class="box-title">{{form.form_title}}</h1>
+<div class="box-main">
+ <form method="post" action=".#{{page.page_id}}" id="form_{{form.form_id}}"{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
   {% csrf_token %}
   {{form.render|safe}}
  </form>
diff --git a/djblets/static/djblets/css/config-forms.less b/djblets/static/djblets/css/config-forms.less
index 01b1fc67726735856061bac76cac18e7eacf6526..a794985ec971e087add7208c1a37ba5d5982bb81 100644
--- a/djblets/static/djblets/css/config-forms.less
+++ b/djblets/static/djblets/css/config-forms.less
@@ -48,7 +48,7 @@
       margin: 0 -@config-forms-box-padding;
     }
 
-    .main {
+    .box-main {
       padding: @config-forms-box-padding;
     }
   }
@@ -58,7 +58,7 @@
     margin-top: 2;
     width: @side-nav-width;
 
-    .main {
+    .box-main {
       padding: 0;
     }
 
@@ -282,7 +282,7 @@
     }
 
     .box {
-      .main {
+      .box-main {
         h3 {
           margin: 0;
           padding: 0.5em 0.3em 0.3em 0.5em;