diff --git a/workspace.module b/workspace.module
index 5a0b4c1..a57e38a 100644
--- a/workspace.module
+++ b/workspace.module
@@ -357,7 +357,7 @@ function workspace_build_rows($result, $account) {
         $row->status ? $yes : $no,
         format_date($row->changed, 'small'),
         module_exists('comment') ? array('data' => $row->comment_count ? $row->comment_count : 0, 'align' => 'right') : array('data' => ''),
-        $may_edit ? l(t('edit'), "node/$row->nid/edit") : '',
+        $may_edit ? l(t('edit'), 'node/$row->nid/edit', array('query' => 'destination=workspace/$user->uid')) : '',
         $may_delete ? l(t('delete'), "workspace/delete/$row->nid") : ''
         );
     }
@@ -459,9 +459,10 @@ function theme_workspace_list($header, $rows, $max, $cols) {
  * Menu callback. Redirect user to delete node.
  */
 function workspace_delete() {
+  global $user;
   $nid = intval(arg(2));
   if (is_numeric($nid)) {
-    drupal_goto('node/'. $nid .'/delete');
+	drupal_goto('node/$nid/delete', 'destination=workspace/$user->uid');
   }
 }