diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm
index 3b3ed966f..6f04b876e 100644
--- a/lib/WebGUI/Admin.pm
+++ b/lib/WebGUI/Admin.pm
@@ -175,7 +175,9 @@ sub www_getClipboard {
     my $session = $self->session;
     my ( $user, $form ) = $session->quick(qw{ user form });
 
-    my $assets      = WebGUI::Asset->getRoot( $session )->getAssetsInClipboard(1);
+    my $userOnly = !$form->get('all');
+
+    my $assets      = WebGUI::Asset->getRoot( $session )->getAssetsInClipboard( $userOnly );
     my @assetInfo   = ();
     for my $asset ( @{$assets} ) {
         push @assetInfo, {
@@ -353,6 +355,8 @@ __DATA__
     <!-- placeholder for clipboard -->
     <dt id="clipboard" class="a-m-t">Clipboard (i18n)</dt>
     <dd class="a-m-d"><div class="bd">
+        <input type="checkbox" id="clipboardShowAll" />
+        <label for="clipboardShowAll" id="clipboardShowAllLabel">Show All (i18n)</label>
         <div id="clipboardItems"></div>
     </div></dd>
     <!-- placeholder for asset helpers -->
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index e01120428..6cf579a6f 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -227,7 +227,8 @@ WebGUI.Admin.prototype.requestUpdateClipboard
         scope: this
     };
 
-    var ajax = YAHOO.util.Connect.asyncRequest( 'GET', '?op=admin;method=getClipboard', callback );
+    var showAll = document.getElementById( 'clipboardShowAll' ).checked ? ";all=1" : ";all=0";
+    var ajax = YAHOO.util.Connect.asyncRequest( 'GET', '?op=admin;method=getClipboard' + showAll, callback );
 };
 
 /**