diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php
index f046d36..63ed1d4 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php
@@ -64,15 +64,18 @@ if (isset($fActions)) {
             $sQueryString .= "fDocumentIDs[]=$fDocumentID&";
         }
     }
+    $sQueryString .= "fReturnFolderID=$fFolderID&";
 
     switch ($fActions) {
     case "delete":
         // delete all selected docs
         controllerRedirect("deleteDocument", $sQueryString);
+        exit(0);
         break;
     case "move":
         // Move selected docs to root folder
         controllerRedirect("moveDocument", $sQueryString . "fFolderID=1");
+        exit(0);
         break;
     }
 }
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
index 1abb0e3..54343f0 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
@@ -44,7 +44,17 @@ function getPage($aDocumentIDs) {
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>&nbsp</td>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td><table><tr><td><a href=\"" . $_SERVER["PHP_SELF"] . "?$sQueryString&fDeleteConfirmed=1\"><img src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"></a></td> <td><a href=\"javascript:history.go(-1)\"><img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a></td></tr></table></td>";	
+	$sToRender .= "<td><table><tr><td>";
+    $sToRender .= "<a href=\"" . $_SERVER["PHP_SELF"] . "?$sQueryString&fDeleteConfirmed=1\"><img src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"></a>";
+    $sToRender .= "</td> <td>";
+    if (KTUtil::arrayGet($_REQUEST, "fReturnFolderID")) {
+        $sToRender .= generateControllerLink("browse", "fFolderID=" . $_REQUEST['fReturnFolderID'], "<img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>");
+    } else if (KTUtil::arrayGet($_REQUEST, "fReturnDocumentID")) {
+        $sToRender .= generateControllerLink("viewDocument", "fDocumentID=" . $_REQUEST['fReturnDocumentID'], "<img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>");
+    } else {
+        $sToRender .= "<a href=\"javascript:history.go(-1)\"><img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>";
+    }
+    $sToRender .= "</td></tr></table></td>";	
 	$sToRender .= "</tr>";
 	$sToRender .= "</table>\n";
 	
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
index 13f142c..940356f 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
@@ -481,6 +481,7 @@ function displayEmailButton($oDocument) {
 function displayDeleteButton($oDocument, $bEdit) {
     if ($bEdit) {
     	$sQueryString = "fDocumentIDs[]=" . $oDocument->getID();
+        $sQueryString .= "&fReturnDocumentID=" . $oDocument->getID();
     	if ($oDocument->getIsCheckedOut()) {
     		$sDisabledText = _("This document can't be deleted because its checked out");
     	}