diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index e230fd974..29cfa60d6 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -81,8 +81,16 @@
                                 <i class="fa fa-exclamation-circle"></i>
                                 This script does not require any input to run.
                             </div>
+                        {% else %}
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <strong>Script Data</strong>
+                                </div>
+                                <div class="panel-body">
+                                    {% render_form form %}
+                                </div>
+                            </div>
                         {% endif %}
-                        {% render_form form %}
                         <div class="pull-right">
                             <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="fa fa-play"></i> Run Script</button>
                             <a href="{% url 'extras:script_list' %}" class="btn btn-default">Cancel</a>