diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 46dbf55c6..110c5c240 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -14,6 +14,7 @@
  - fixed: Can't call method "getSku" on unblessed reference
  - fixed: PurgeOldInboxMessages just didn't work
  - fixed: Unable to delete data form entries
+ - fixed: Select All checkbox in Asset Manager has returned
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 80313943c..0d581eede 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -387,6 +387,13 @@ sub www_manage {
     }
 
     # Show the page
+    # i18n we'll need later
+    # TODO: Add all i18n to this hash so we can better format our JS code
+    my %i18n    = (
+        "select all"    => $i18n->get( "select all" ),
+    );
+
+    # Add script and stylesheets
     $session->style->setLink( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
     $session->style->setLink( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
     $session->style->setLink( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
@@ -399,6 +406,7 @@ sub www_manage {
     $session->style->setScript( $session->url->extras( 'yui/build/menu/menu-min.js' ) );
     $session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );
     $session->style->setScript( $session->url->extras( 'yui-webgui/build/form/form.js' ) );
+
     my $extras      = $session->url->extras;
     $session->style->setRawHeadTags( <<ENDHTML );
     <script type="text/javascript">
@@ -528,7 +536,7 @@ ENDHTML
                     . 'WebGUI.AssetManager.MoreMenuItems = ' . getMoreMenu( $session ) . ';'
                     ;
 
-    $output         .= <<'ENDJS';
+    $output         .= <<"ENDJS";
     // Start the data source
     WebGUI.AssetManager.DataSource
         = new YAHOO.util.DataSource( '?op=assetManager;method=ajaxGetManagerPage' );
@@ -568,12 +576,15 @@ ENDHTML
             return query;
         };
 
+    var selectAllButton = "<input type=\\"checkbox\\" title=\\"$i18n{"select all"}\\" onclick=\\"WebGUI.Form.toggleAllCheckboxesInForm( document.forms[0], 'assetId' );\\" />";
 ENDJS
 
+    # Column defs have i18n, so be careful
+    # Can't be Perl datastructure because formatter must be a function ref not a string
     $output .= q(
     WebGUI.AssetManager.ColumnDefs
         = [ 
-            { key: 'assetId', label: "", formatter: WebGUI.AssetManager.formatAssetIdCheckbox },
+            { key: 'assetId', label: selectAllButton, formatter: WebGUI.AssetManager.formatAssetIdCheckbox },
             { key: 'lineage', label: ") . $i18n->get( 'rank' ) . q(", sortable: true, formatter: WebGUI.AssetManager.formatRank },
             { key: 'actions', label: "", formatter: WebGUI.AssetManager.formatActions },
             { key: 'title', label: ") . $i18n->get( 99 ) . q(", formatter: WebGUI.AssetManager.formatTitle, sortable: true },