Index: form_controller.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/form_controller/form_controller.module,v
retrieving revision 1.5
diff -u -p -r1.5 form_controller.module
--- form_controller.module	19 Nov 2009 11:42:39 -0000	1.5
+++ form_controller.module	25 Nov 2009 21:17:50 -0000
@@ -60,7 +60,7 @@ function form_controller_form_alter(&$fo
 
   // Output a contextual configuration link.
   $output = '<div class="form-controller">';
-  $output .= l(t('Configure this form'), 'form_controller/' . $form['form_build_id']['#value']);
+  $output .= l(t('Configure this form'), 'form_controller/' . $form['form_build_id']['#value'], array('query' => drupal_get_destination()));
   $output .= '</div>';
   if (!isset($form['#prefix'])) {
     $form['#prefix'] = '';
@@ -297,4 +297,3 @@ function contact_form_webmaster_submit($
     'message' => $message,
   ), TRUE) . '</pre>');
 }
-