diff --git a/modules/fields/atom_reference/atom_reference.js b/modules/fields/atom_reference/atom_reference.js
index 09f6860..9521ec0 100644
--- a/modules/fields/atom_reference/atom_reference.js
+++ b/modules/fields/atom_reference/atom_reference.js
@@ -4,13 +4,18 @@
  */
 (function($) {
 Drupal.behaviors.atom_reference = {
-  attach: function(context) {
+  attach: function(context, settings) {
+
     $("div.atom_reference_drop_zone:not(.atom_reference_processed)").each(function() {
       var $this = $(this);
-      var $reset = $("<input type='button' />")
+      
+      var $buttons_wrapper = $('<div class="buttons-wrapper"/>');
+      
+      // Delete button
+      $("<input type='button' />")
         .val(Drupal.t('Delete'))
         .click(function() {
-          $(this)
+          $buttons_wrapper
             .hide()
             .closest('div.form-item')
             .find('input:text')
@@ -19,11 +24,24 @@ Drupal.behaviors.atom_reference = {
             .find('div.atom_reference_drop_zone')
             .empty()
             .append(Drupal.t('Drop a resource here'))
-        });
+        }).appendTo($buttons_wrapper);
+        
+        // Edit link
+        var match_atom_id = /<!-- scald=(\d+):.*-->/g.exec($this.html());
+        if (match_atom_id) {
+          var atom_id = match_atom_id[1];
+          $("<a>")
+            .html(Drupal.t('Edit'))
+            .attr('href', settings.basePath + 'atom/' + atom_id + '/edit/nojs')
+            .attr('target', '_blank')
+            .addClass('ctools-use-modal ctools-modal-custom-style ctools-use-modal-processed')
+            .appendTo($buttons_wrapper);
+        }
+        
       // If the element doesn't have a value yet, hide the Delete button
       // by default
       if (!$this.closest('div.form-item').find('input:text').val()) {
-        $reset.css('display', 'none');
+        $buttons_wrapper.css('display', 'none');
       }
       $this
         .addClass('atom_reference_processed')
@@ -41,7 +59,7 @@ Drupal.behaviors.atom_reference = {
               .find('input:text')
               .val(dt)
               .end()
-              .find('input:button')
+              .find('.buttons-wrapper')
               .show();
           }
           else {
@@ -56,7 +74,7 @@ Drupal.behaviors.atom_reference = {
         .find('input')
         .css('display', 'none')
         .end()
-        .append($reset);
+        .append($buttons_wrapper);
     });
   }
 }