diff --git a/views_field_view_handler_field_view.inc b/views_field_view_handler_field_view.inc
index 629b85e..f68e5f3 100644
--- a/views_field_view_handler_field_view.inc
+++ b/views_field_view_handler_field_view.inc
@@ -95,8 +95,35 @@ class views_field_view_handler_field_view extends views_handler_field {
         '#description' => t('Select a view display to use.'),
         '#default_value' => $this->options['display'],
         '#options' => $display_options,
+        '#ajax' => array(
+          'path' => views_ui_build_form_url($form_state),
+        ),
+        '#submit' => array('views_ui_config_item_form_submit_temporary'),
+        '#executes_submit_callback' => TRUE,
         '#fieldset' => 'views_field_view',
       );
+
+      // Provide a way to directly access the views edit link of the child view.
+      // Don't show this link if the current view is the selected child view.
+      if ($this->options['view'] && $this->options['display'] && ($this->view->name != $this->options['view'])) {
+        // l() text is passed through t(), so format string first instead.
+        $link_text = format_string('edit "@view (@display)" view', array('@view' => $this->options['view'], '@display' => $this->options['display']));
+        $form['view_edit_link'] = array(
+          '#theme' => 'link',
+          '#text' => $link_text,
+          '#path' => 'admin/structure/views/view/' . $this->options['view'] . '/edit/' . $this->options['display'],
+          '#options' => array(
+            'attributes' => array(
+              'target' => '_blank',
+              'class' => array('views-field-view-child-view-edit'),
+            ),
+          ),
+          '#fieldset' => 'views_field_view',
+          '#prefix' => '[',
+          '#suffix' => ']',
+        );
+      }
+
       $form['arguments'] = array(
         '#title' => t('Contextual filters'),
         '#description' => t('Use a comma (,) or forwardslash (/) separated list of each contextual filter which should be forwared to the view.