diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index b12ecc11d..7720905d7 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -377,6 +377,12 @@ class ImageAttachmentForm(BootstrapMixin, forms.ModelForm):
 
 class JournalEntryForm(BootstrapMixin, forms.ModelForm):
 
+    kind = forms.ChoiceField(
+        choices=add_blank_choice(JournalEntryKindChoices),
+        required=False,
+        widget=StaticSelect2()
+    )
+
     class Meta:
         model = JournalEntry
         fields = ['assigned_object_type', 'assigned_object_id', 'kind', 'comments']
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index 6c50ca547..8417dd380 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -3,30 +3,30 @@
 
 {% block title %}{{ block.super }} - Journal{% endblock %}
 
+{% render_errors form %}
+
 {% block content %}
     {% if perms.extras.add_journalentry %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>New Journal Entry</strong>
-            </div>
-            <form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data" class="form form-horizontal">
+    <div class="col-md-9 col-md-offset-3">
+        <div class="field-group">
+            <h4>New Journal Entry</h4>
+            <form action="{% url 'extras:journalentry_add' %}" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 {% for field in form.hidden_fields %}
                     {{ field }}
                 {% endfor %}
-                <div class="row panel-body">
-                    <div class="col-md-10">
-                        {% render_field form.kind %}
-                        {% render_field form.comments %}
-                    </div>
-                    <div class="col-md-9 col-md-offset-3">
-                        <button type="submit" class="btn btn-primary">Save</button>
-                        <a href="{{ object.get_absolute_url }}" class="btn btn-default">Cancel</a>
-                    </div>
-                </div>
+                {% render_field form.kind %}
+                {% render_field form.comments %}
             </form>
         </div>
+        <div class="col-md-12 col-md-offset-3 text-end my-3">
+            <a href="{{ object.get_absolute_url }}" class="btn btn-outline-danger">Cancel</a>
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
     {% endif %}
-    {% include 'panel_table.html' %}
+    <div class="col-md-9 col-md-offset-3 mb-3">
+        {% include 'panel_table.html' %}
+    </div>
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}