diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 4a209093e..1ed7294fc 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -31,7 +31,6 @@
   {# Clone/Edit/Delete Buttons #}
   <div class="controls">
     <div class="control-group">
-      {% custom_links object %}
       {% plugin_buttons object %}
 
       {# Extra buttons #}
@@ -48,6 +47,9 @@
       {% endif %}
 
     </div>
+    <div class="control-group">
+      {% custom_links object %}
+    </div>
   </div>
 {% endblock controls %}