diff --git a/nag/app/controllers/SaveTask.php b/nag/app/controllers/SaveTask.php
index f06c0c615c2..6ff541c2c2a 100644
--- a/nag/app/controllers/SaveTask.php
+++ b/nag/app/controllers/SaveTask.php
@@ -102,7 +102,7 @@ public function processRequest(Horde_Controller_Request $request, Horde_Controll
                 'tasklist_id' => $info['tasklist_id'],
                 'parent' => $info['parent']));
         } else {
-            $url = Horde_Util::getFormData('url', Horde::url('list.php', true));
+            $url = Horde_Util::getFormData('url', Horde::url('list.php', true)->add(array('tab_name' => $vars->get('tab_name'))));
         }
 
         $response->setRedirectUrl($url);
diff --git a/nag/lib/Form/Task.php b/nag/lib/Form/Task.php
index 21c859588b9..75ef1372b7c 100644
--- a/nag/lib/Form/Task.php
+++ b/nag/lib/Form/Task.php
@@ -55,6 +55,7 @@ public function __construct($vars, $title = '')
         $this->addHidden('', 'url', 'text', false);
         $this->addHidden('', 'uid', 'text', false);
         $this->addHidden('', 'owner', 'text', false);
+        $this->addHidden('', 'tab_name', 'text', false);
 
         $this->setSection(self::SECTION_GENERAL, _("General"));
         $this->addVariable(_("Name"), 'name', 'text', true);
diff --git a/nag/lib/View/List.php b/nag/lib/View/List.php
index 3168abb56cf..c698450d3c4 100644
--- a/nag/lib/View/List.php
+++ b/nag/lib/View/List.php
@@ -129,6 +129,7 @@ public function render($output)
         $view->columns = @unserialize($prefs->getValue('tasklist_columns'));
         $view->smartShare = $this->_smartShare;
         $view->haveSearch = $this->_haveSearch;
+        $view->tabName = $this->_vars->get('tab_name', $prefs->getValue('show_completed'));
 
         if (empty($view->columns)) {
             $view->columns = array();
diff --git a/nag/task.php b/nag/task.php
index 42d6fe60e60..090047674e7 100644
--- a/nag/task.php
+++ b/nag/task.php
@@ -106,6 +106,9 @@ function _delete($task_id, $tasklist_id)
             $vars = new Horde_Variables($h);
             $vars->set('old_tasklist', $task->tasklist);
             $vars->set('url', Horde_Util::getFormData('url'));
+            if ($tab = Horde_Util::getFormData('tab_name')) {
+               $vars->set('tab_name', $tab);
+            }
             $form = new Nag_Form_Task($vars, sprintf(_("Edit: %s"), $task->name));
             break;
         }
diff --git a/nag/templates/list/_task.html.php b/nag/templates/list/_task.html.php
index a64d6e7999c..8086f2a20a7 100644
--- a/nag/templates/list/_task.html.php
+++ b/nag/templates/list/_task.html.php
@@ -35,7 +35,7 @@
     if ($have_edit &&
         (!$task->private || $task->owner == $GLOBALS['registry']->getAuth())) {
         $label = sprintf(_("Edit \"%s\""), $task->name);
-        echo Horde::link($task->edit_link->add('have_search', $this->haveSearch), $label) . Horde::img('edit.png', $label) . '</a>';
+        echo Horde::link($task->edit_link->add(array('have_search' => $this->haveSearch, 'tab_name' => $this->tabName)), $label) . Horde::img('edit.png', $label) . '</a>';
     }
     ?>
   </td>