diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4922087c0..b5d7ff12a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
    from Add/Edit Field dialogs (SDH Consulting Group).
  - fixed #4214: Missing i18n in asset manager
  - fixed #8849: More missing i18n
+ - fixed #4182: Edit links show in asset manager for locked assets
 
 7.6.3
  - improved performance of file uploads
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 1850e7832..9a5994547 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -288,7 +288,7 @@ sub www_ajaxGetManagerPage {
             childCount      => $asset->getChildCount,
             assetSize       => $asset->get( 'assetSize' ),
             lockedBy        => $asset->get( 'isLockedBy' ),
-            canEditIfLocked => $asset->canEditIfLocked,
+            actions         => $asset->canEdit && $asset->canEditIfLocked,
         );
 
         $fields{ className } = {};
diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js
index f63ca4a18..df88234e7 100644
--- a/www/extras/yui-webgui/build/assetManager/assetManager.js
+++ b/www/extras/yui-webgui/build/assetManager/assetManager.js
@@ -61,10 +61,16 @@ WebGUI.AssetManager.findRow
     Format the Edit and More links for the row
 */
 WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNumber ) {
-    elCell.innerHTML 
-        = '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=edit;proceed=manageAssets') + '">' + WebGUI.AssetManager.i18n.get('Asset', 'edit') + '</a>'
-        + ' | '
-        ;
+    if ( oRecord.getData( 'actions' ) ) {
+        elCell.innerHTML 
+            = '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=edit;proceed=manageAssets') + '">'
+            + WebGUI.AssetManager.i18n.get('Asset', 'edit') + '</a>'
+            + ' | '
+            ;
+    }
+    else {
+        elCell.innerHTML = "";
+    }
     var more    = document.createElement( 'a' );
     elCell.appendChild( more );
     more.appendChild( document.createTextNode( WebGUI.AssetManager.i18n.get('Asset','More' ) ) );
@@ -239,8 +245,6 @@ WebGUI.AssetManager.initDataTable = function (o) {
         rowsPerPage           : 100,
         previousPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', '< prev'),
         nextPageLinkLabel     : WebGUI.AssetManager.i18n.get('WebGUI', 'next >'),
-//        previousPageLinkLabel : 'fred',
-//        nextPageLinkLabel     : 'barney',
         template              : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}"
     });