diff --git a/tuskar_boxes/static/tuskar_boxes/js/tuskar.boxes.js b/tuskar_boxes/static/tuskar_boxes/js/tuskar.boxes.js
index 54921f2..fdaa402 100644
--- a/tuskar_boxes/static/tuskar_boxes/js/tuskar.boxes.js
+++ b/tuskar_boxes/static/tuskar_boxes/js/tuskar.boxes.js
@@ -79,6 +79,7 @@ tuskar.boxes = (function () {
           ui.draggable.find('input.boxes-flavor'
               ).val($(this).closest('.boxes-flavor').data('flavor'));
           $count.trigger('change');
+          ui.draggable.find('a[name^=role-edit]').removeClass('hidden');
           window.setTimeout(update_boxes, 0);
         }
     });
@@ -91,6 +92,7 @@ tuskar.boxes = (function () {
           ui.draggable.appendTo(this);
           ui.draggable.find('input.boxes-flavor').val('');
           ui.draggable.find('input.number-picker').trigger('change').val(0);
+          ui.draggable.find('a[name^=role-edit]').addClass('hidden');
           window.setTimeout(update_boxes, 0);
         }
     });
diff --git a/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html b/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
index 2482dbf..2228f1a 100644
--- a/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
+++ b/tuskar_boxes/templates/tuskar_boxes/overview/role_nodes_edit.html
@@ -12,6 +12,13 @@
         {{ role.field|add_bootstrap_class }}
         {{ role.flavor_field|add_bootstrap_class }}
         {{ role.name|title }}
+      <a
+        name="role-edit-{{role.name|slugify}}"
+        href="{% url 'horizon:infrastructure:roles:update' role_id=role.id %}"
+        class="btn pull-right hidden">
+        <b class="fa fa-lg fa-fw fa-pencil"></b>
+      </a>
+
     </div>
 {% endspaceless %}{% endfor %}
 </div>
@@ -35,6 +42,12 @@
                     {{ role.field|add_bootstrap_class }}
                     {{ role.flavor_field|add_bootstrap_class }}
                     {{ role.name|title }}
+                  <a
+                    name="role-edit-{{role.name|slugify}}"
+                    href="{% url 'horizon:infrastructure:roles:update' role_id=role.id %}"
+                    class="btn pull-right">
+                    <b class="fa fa-lg fa-fw fa-pencil"></b>
+                  </a>
                 </div>
             {% endspaceless %}{% endfor %}
             </div>