diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 6f8ae69c681..2918d2fe3c1 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -396,7 +396,19 @@
                                 </div>
                             {% endif %}
                             {% if perms.secrets.view_secret %}
-                                {% include 'secrets/inc/assigned_secrets.html' %}
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <strong>Secrets</strong>
+                                    </div>
+                                    {% include 'secrets/inc/assigned_secrets.html' %}
+                                    {% if perms.secrets.add_secret %}
+                                        <div class="panel-footer text-right noprint">
+                                            <a href="{% url 'secrets:secret_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                                                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add secret
+                                            </a>
+                                        </div>
+                                    {% endif %}
+                                </div>
                             {% endif %}
                             <div class="panel panel-default">
                                 <div class="panel-heading">
diff --git a/netbox/templates/secrets/inc/assigned_secrets.html b/netbox/templates/secrets/inc/assigned_secrets.html
index 11ad5e75d25..2da526a5cc9 100644
--- a/netbox/templates/secrets/inc/assigned_secrets.html
+++ b/netbox/templates/secrets/inc/assigned_secrets.html
@@ -1,41 +1,26 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <strong>Secrets</strong>
+{% if secrets %}
+    <table class="table table-hover panel-body">
+        {% for secret in secrets %}
+            <tr>
+                <td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td>
+                <td>{{ secret.name }}</td>
+                <td id="secret_{{ secret.pk }}">********</td>
+                <td class="text-right noprint">
+                    <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
+                        <i class="fa fa-lock"></i> Unlock
+                    </button>
+                    <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
+                        <i class="fa fa-copy"></i> Copy
+                    </button>
+                    <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
+                        <i class="fa fa-unlock-alt"></i> Lock
+                    </button>
+                </td>
+            </tr>
+        {% endfor %}
+    </table>
+{% else %}
+    <div class="panel-body text-muted">
+        None found
     </div>
-    {% if secrets %}
-        <table class="table table-hover panel-body">
-            {% for secret in secrets %}
-                <tr>
-                    <td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td>
-                    <td>{{ secret.name }}</td>
-                    <td id="secret_{{ secret.pk }}">********</td>
-                    <td class="text-right noprint">
-                        <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
-                            <i class="fa fa-lock"></i> Unlock
-                        </button>
-                        <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
-                            <i class="fa fa-copy"></i> Copy
-                        </button>
-                        <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
-                            <i class="fa fa-unlock-alt"></i> Lock
-                        </button>
-                    </td>
-                </tr>
-            {% endfor %}
-        </table>
-    {% else %}
-        <div class="panel-body text-muted">
-            None found
-        </div>
-    {% endif %}
-    {% if perms.secrets.add_secret %}
-        <form id="secret_form">
-            {% csrf_token %}
-        </form>
-        <div class="panel-footer text-right noprint">
-            <a href="{% url 'secrets:secret_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
-                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add secret
-            </a>
-        </div>
-    {% endif %}
-</div>
+{% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 3f0a37b88fa..7eabcf50492 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -221,7 +221,19 @@
             </table>
         </div>
         {% if perms.secrets.view_secret %}
-            {% include 'secrets/inc/assigned_secrets.html' %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Secrets</strong>
+                </div>
+                {% include 'secrets/inc/assigned_secrets.html' %}
+                {% if perms.secrets.add_secret %}
+                    <div class="panel-footer text-right noprint">
+                        <a href="{% url 'secrets:secret_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-xs btn-primary">
+                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add secret
+                        </a>
+                    </div>
+                {% endif %}
+            </div>
         {% endif %}
         <div class="panel panel-default">
             <div class="panel-heading">