diff --git a/application/views/scripts/object/fields.phtml b/application/views/scripts/object/fields.phtml
index 928f5dcc..64bd111b 100644
--- a/application/views/scripts/object/fields.phtml
+++ b/application/views/scripts/object/fields.phtml
@@ -1,6 +1,9 @@
 <div class="controls">
 <?= $this->tabs ?>
 <h1><?= $this->escape($this->title) ?></h1>
+<span>
+<?= $this->actionLinks ?>
+</span>
 </div>
 
 <div class="content">
diff --git a/library/Director/Web/Controller/ObjectController.php b/library/Director/Web/Controller/ObjectController.php
index b92d7de4..745058d6 100644
--- a/library/Director/Web/Controller/ObjectController.php
+++ b/library/Director/Web/Controller/ObjectController.php
@@ -184,6 +184,14 @@ abstract class ObjectController extends ActionController
                 $type . '_id' => $object->id,
                 'datafield_id' => $id
             ));
+
+            $this->view->actionLinks = $this->view->qlink(
+                $this->translate('back'),
+                $this->getRequest()->getUrl()->without('field_id'),
+                null,
+                array('class' => 'icon-left-big')
+            );
+
         }
 
         $form->handleRequest();