diff --git a/include/objectManager.php b/include/objectManager.php
index 0aacf10..76680f5 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -935,7 +935,8 @@ class ObjectManager
         if($sAction)
             $sUrl .= "&sAction=$sAction";
 
-
+        if($this->sReturnTo)
+            $sUrl .= "&sReturnTo=".urlencode($this->sReturnTo);
 
         if(!$sTitle)
             $sTitle = $this->sTitle;
diff --git a/screenshots.php b/screenshots.php
index 306ae7d..ca23e53 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -107,7 +107,9 @@ if($hResult && query_num_rows($hResult))
             )
           )
         {
-            echo "<br />[<a href='screenshots.php?sCmd=delete&iImageId=$oRow->id&iAppId=".$aClean['iAppId']."&iVersionId=".$aClean['iVersionId']."'>Delete Image</a>]";
+            $oM = new objectManager("screenshot");
+            $oM->sReturnTo = "screenshots.php?iAppId=".$oScreenshot->iAppId."&iVersionId=".$oScreenshot->iVersionId;
+            echo '<br />[<a href="'.$oM->makeUrl("delete", $oScreenshot->iScreenshotId, "Delete Screenshot").'">Delete</a>]';
         }
 
         echo "</div></td>\n";