diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index f0be95698..fc10db80f 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -76,18 +76,22 @@
                     {% endif %}
                     <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
                         {% csrf_token %}
-                        <div class="alert alert-info">
-                            <i class="fa fa-exclamation-circle"></i>
-                            This script does not require any input to run.
-                        </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <strong>Script Data</strong>
+                        {% if form.requires_input %}
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <strong>Script Data</strong>
+                                </div>
+                                <div class="panel-body">
+                                    {% render_form form %}
+                                </div>
                             </div>
-                            <div class="panel-body">
-                                {% render_form form %}
+                        {% else %}
+                             <div class="alert alert-info">
+                                <i class="fa fa-exclamation-circle"></i>
+                                This script does not require any input to run.
                             </div>
-                        </div>
+                            {% render_form form %}
+                        {% endif %}
                         <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>