diff --git a/lib/Doctrine/Repositories/BasketRepository.php b/lib/Doctrine/Repositories/BasketRepository.php
index 46c57bc779..06ac092e44 100644
--- a/lib/Doctrine/Repositories/BasketRepository.php
+++ b/lib/Doctrine/Repositories/BasketRepository.php
@@ -261,7 +261,7 @@ class BasketRepository extends EntityRepository
       default:
         $dql     = 'SELECT b, e, s, p
                 FROM Entities\Basket b
-                JOIN b.elements e
+                LEFT JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
                 WHERE (b.usr_id = :usr_id OR p.usr_id = :validating_usr_id)';
@@ -270,6 +270,17 @@ class BasketRepository extends EntityRepository
           'validating_usr_id' => $user->get_id()
         );
         break;
+      case self::MYBASKETS:
+        $dql     = 'SELECT b, e, s, p
+                FROM Entities\Basket b
+                LEFT JOIN b.elements e
+                LEFT JOIN b.validation s
+                LEFT JOIN s.participants p
+                WHERE (b.usr_id = :usr_id)';
+        $params  = array(
+          'usr_id'            => $user->get_id()
+        );
+        break;
     }
 
     if (ctype_digit($year) && strlen($year) == 4)
diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig
index 145696ae03..cbbdd85635 100644
--- a/templates/web/prod/WorkZone/Browser/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig
@@ -11,6 +11,7 @@
         <td>
           <h1 class="title">
             <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
+            {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
             <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
               <span>
                 <img src="/skins/prod/Basket/Browser/archive.png"/>
@@ -21,6 +22,7 @@
                 <img src="/skins/prod/Basket/Browser/archived.png"/>
               </span>
             </a>
+            {% endif %}
             <a class="basket_link" href="#">
               {{ Basket.getName() }}
             </a>
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index abad5ec4da..b74a89dce8 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -49,6 +49,7 @@
             <td class="content">
               <h1 class="title">
                 <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
+                {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
                 <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
                   <span>
                     <img src="/skins/prod/Basket/Browser/archive.png"/>
@@ -59,6 +60,7 @@
                     <img src="/skins/prod/Basket/Browser/archived.png"/>
                   </span>
                 </a>
+                {% endif %}
                 <a class="basket_link" href="/prod/WorkZone/Browse/Basket/{{ Basket.getId() }}/">
                   {{ Basket.getName() }}
                 </a>