diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 191008a1d..ec4e87d24 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -67,7 +67,9 @@
  - rfe: Add template variables for every property of all assets referenced in the Navigation.
  - rfe: VIM perl mode for skeletons
  - rfe: Add edit button to Manage Revisions page
+ - fixed: Asset Edit Form has URL of asset we went to, not asset we're editing
  - rfe: Protected profile fields don't show delete icon
+ - fixed: Asset manager now sets "proceed" so we go back to asset manager after editing an asset
  - rfe: Registration form to keep user entries on error - required and errored fields are now highlighted.
 
 7.5.22
diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js
index 12cff84c8..b6fa0719c 100644
--- a/www/extras/yui-webgui/build/assetManager/assetManager.js
+++ b/www/extras/yui-webgui/build/assetManager/assetManager.js
@@ -51,7 +51,7 @@ WebGUI.AssetManager.findRow
 WebGUI.AssetManager.formatActions 
 = function ( elCell, oRecord, oColumn, orderNumber ) {
     elCell.innerHTML 
-        = '<a href="' + oRecord.getData( 'url' ) + '?func=edit">Edit</a>'
+        = '<a href="' + oRecord.getData( 'url' ) + '?func=edit;proceed=manageAssets">Edit</a>'
         + ' | '
         ;
     var more    = document.createElement( 'a' );