diff --git a/cypress/integration/deposit-admin.spec.js b/cypress/integration/deposit-admin.spec.js
index 2fbeac94..39dac647 100644
--- a/cypress/integration/deposit-admin.spec.js
+++ b/cypress/integration/deposit-admin.spec.js
@@ -1,155 +1,159 @@
 /**
  * Copyright (C) 2020  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 // data to use as request query response
 let responseDeposits;
 let expectedOrigins;
 
 describe('Test admin deposit page', function() {
   beforeEach(() => {
     responseDeposits = [
       {
         'id': 614,
         'external_id': 'ch-de-1',
         'reception_date': '2020-05-18T13:48:27Z',
         'status': 'done',
         'status_detail': null,
         'swhid': 'swh:1:dir:ef04a768',
         'swhid_context': 'swh:1:dir:ef04a768;origin=https://w.s.o/c-d-1;visit=swh:1:snp:b234be1e;anchor=swh:1:rev:d24a75c9;path=/'
       },
       {
         'id': 613,
         'external_id': 'ch-de-2',
         'reception_date': '2020-05-18T11:20:16Z',
         'status': 'done',
         'status_detail': null,
         'swhid': 'swh:1:dir:181417fb',
         'swhid_context': 'swh:1:dir:181417fb;origin=https://w.s.o/c-d-2;visit=swh:1:snp:8c32a2ef;anchor=swh:1:rev:3d1eba04;path=/'
       },
       {
         'id': 612,
         'external_id': 'ch-de-3',
         'reception_date': '2020-05-18T11:20:16Z',
         'status': 'rejected',
         'status_detail': 'incomplete deposit!',
         'swhid': null,
         'swhid_context': null
       }
     ];
     // those are computed from the
     expectedOrigins = {
       614: 'https://w.s.o/c-d-1',
       613: 'https://w.s.o/c-d-2',
       612: ''
     };
 
   });
 
   it('Should display properly entries', function() {
     cy.adminLogin();
     cy.visit(this.Urls.admin_deposit());
 
     let testDeposits = responseDeposits;
 
     cy.server();
     cy.route({
       method: 'GET',
       url: `${this.Urls.admin_deposit_list()}**`,
       response: {
         'draw': 10,
         'recordsTotal': testDeposits.length,
         'recordsFiltered': testDeposits.length,
         'data': testDeposits
       }
     }).as('listDeposits');
 
     cy.location('pathname')
       .should('be.equal', this.Urls.admin_deposit());
     cy.url().should('include', '/admin/deposit');
 
     cy.get('#swh-admin-deposit-list')
       .should('exist');
 
     cy.wait('@listDeposits').then((xhr) => {
       cy.log('response:', xhr.response);
       cy.log(xhr.response.body);
       let deposits = xhr.response.body.data;
       cy.log('Deposits: ', deposits);
       expect(deposits.length).to.equal(testDeposits.length);
 
       cy.get('#swh-admin-deposit-list').find('tbody > tr').as('rows');
 
       // only 2 entries
       cy.get('@rows').each((row, idx, collection) => {
         let deposit = deposits[idx];
         let responseDeposit = testDeposits[idx];
         assert.isNotNull(deposit);
         assert.isNotNull(responseDeposit);
         expect(deposit.id).to.be.equal(responseDeposit['id']);
         expect(deposit.external_id).to.be.equal(responseDeposit['external_id']);
         expect(deposit.status).to.be.equal(responseDeposit['status']);
         expect(deposit.status_detail).to.be.equal(responseDeposit['status_detail']);
         expect(deposit.swhid).to.be.equal(responseDeposit['swhid']);
         expect(deposit.swhid_context).to.be.equal(responseDeposit['swhid_context']);
 
         let expectedOrigin = expectedOrigins[deposit.id];
         // ensure it's in the dom
         cy.contains(deposit.id).should('be.visible');
         if (deposit.status !== 'rejected') {
           expect(row).to.not.contain(deposit.external_id);
           cy.contains(expectedOrigin).should('be.visible');
         }
 
         cy.contains(deposit.status).should('be.visible');
         // those are hidden by default, so now visible
         if (deposit.status_detail !== null) {
           cy.contains(deposit.status_detail).should('not.be.visible');
         }
 
         // those are hidden by default
         if (deposit.swhid !== null) {
           cy.contains(deposit.swhid).should('not.be.visible');
           cy.contains(deposit.swhid_context).should('not.be.visible');
         }
       });
 
       // toggling all links and ensure, the previous checks are inverted
       cy.get('a.toggle-col').click({'multiple': true}).then(() => {
         cy.get('#swh-admin-deposit-list').find('tbody > tr').as('rows');
 
         cy.get('@rows').each((row, idx, collection) => {
           let deposit = deposits[idx];
           let expectedOrigin = expectedOrigins[deposit.id];
 
           // ensure it's in the dom
           cy.contains(deposit.id).should('not.be.visible');
           if (deposit.status !== 'rejected') {
             expect(row).to.not.contain(deposit.external_id);
             expect(row).to.contain(expectedOrigin);
           }
 
           expect(row).to.not.contain(deposit.status);
           // those are hidden by default, so now visible
           if (deposit.status_detail !== null) {
             cy.contains(deposit.status_detail).should('be.visible');
           }
 
           // those are hidden by default, so now they should be visible
           if (deposit.swhid !== null) {
             cy.contains(deposit.swhid).should('be.visible');
             cy.contains(deposit.swhid_context).should('be.visible');
+            // check SWHID link text formatting
+            cy.contains(deposit.swhid_context).then(elt => {
+              expect(elt[0].innerHTML).to.equal(deposit.swhid_context.replace(/;/g, ';<br>'));
+            });
           }
         });
       });
 
       cy.get('#swh-admin-deposit-list-error')
         .should('not.contain',
                 'An error occurred while retrieving the list of deposits');
     });
 
   });
 });
diff --git a/swh/web/assets/src/bundles/admin/deposit.js b/swh/web/assets/src/bundles/admin/deposit.js
index 69479430..b9f162fc 100644
--- a/swh/web/assets/src/bundles/admin/deposit.js
+++ b/swh/web/assets/src/bundles/admin/deposit.js
@@ -1,162 +1,163 @@
 /**
  * Copyright (C) 2018-2020  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 function genSwhLink(data, type) {
   if (type === 'display') {
     if (data && data.startsWith('swh')) {
-      let browseUrl = Urls.browse_swhid(data);
-      return `<a href="${browseUrl}">${data}</a>`;
+      const browseUrl = Urls.browse_swhid(data);
+      const formattedSWHID = data.replace(/;/g, ';<br/>');
+      return `<a href="${browseUrl}">${formattedSWHID}</a>`;
     }
   }
   return data;
 }
 
 export function initDepositAdmin() {
   let depositsTable;
   $(document).ready(() => {
     $.fn.dataTable.ext.errMode = 'none';
     depositsTable = $('#swh-admin-deposit-list')
       .on('error.dt', (e, settings, techNote, message) => {
         $('#swh-admin-deposit-list-error').text(message);
       })
       .DataTable({
         serverSide: true,
         processing: true,
         // let's define the order of table options display
         // f: (f)ilter
         // l: (l)ength changing
         // r: p(r)ocessing
         // t: (t)able
         // i: (i)nfo
         // p: (p)agination
         // see https://datatables.net/examples/basic_init/dom.html
         dom: '<<"d-flex justify-content-between align-items-center"f' +
              '<"#list-exclude">l>rt<"bottom"ip>>',
         // div#list-exclude is a custom filter added next to dataTable
         // initialization below through js dom manipulation, see
         // https://datatables.net/examples/advanced_init/dom_toolbar.html
         ajax: {
           url: Urls.admin_deposit_list(),
           data: d => {
             d.excludePattern = $('#swh-admin-deposit-list-exclude-filter').val();
           }
         },
         columns: [
           {
             data: 'id',
             name: 'id'
           },
           {
             data: 'swhid_context',
             name: 'swhid_context',
             render: (data, type, row) => {
               if (data && type === 'display') {
                 let originPattern = ';origin=';
                 let originPatternIdx = data.indexOf(originPattern);
                 if (originPatternIdx !== -1) {
                   let originUrl = data.slice(originPatternIdx + originPattern.length);
                   let nextSepPattern = ';';
                   let nextSepPatternIdx = originUrl.indexOf(nextSepPattern);
                   if (nextSepPatternIdx !== -1) { /* Remove extra context */
                     originUrl = originUrl.slice(0, nextSepPatternIdx);
                   }
                   return `<a href="${originUrl}">${originUrl}</a>`;
                 }
               }
               return data;
             }
           },
           {
             data: 'reception_date',
             name: 'reception_date',
             render: (data, type, row) => {
               if (type === 'display') {
                 let date = new Date(data);
                 return date.toLocaleString();
               }
               return data;
             }
           },
           {
             data: 'status',
             name: 'status'
           },
           {
             data: 'status_detail',
             name: 'status_detail',
             render: (data, type, row) => {
               if (type === 'display' && data) {
                 let text = data;
                 if (typeof data === 'object') {
                   text = JSON.stringify(data, null, 4);
                 }
                 return `<div style="width: 200px; white-space: pre; overflow-x: auto;">${text}</div>`;
               }
               return data;
             },
             orderable: false,
             visible: false
           },
           {
             data: 'swhid',
             name: 'swhid',
             render: (data, type, row) => {
               return genSwhLink(data, type);
             },
             orderable: false,
             visible: false
           },
           {
             data: 'swhid_context',
             name: 'swhid_context',
             render: (data, type, row) => {
               return genSwhLink(data, type);
             },
             orderable: false,
             visible: false
           }
         ],
         scrollX: true,
         scrollY: '50vh',
         scrollCollapse: true,
         order: [[0, 'desc']]
       });
 
     // Some more customization is needed on the table
     $('div#list-exclude').html(`<div id="swh-admin-deposit-list-exclude-wrapper">
     <div id="swh-admin-deposit-list-exclude-div-wrapper" class="dataTables_filter">
       <label>
         Exclude:<input id="swh-admin-deposit-list-exclude-filter"
                        type="search"
                        value="check-deposit"
                        class="form-control form-control-sm"
                        placeholder="exclude-pattern" aria-controls="swh-admin-deposit-list">
           </input>
       </label>
     </div>
   </div>
 `);
     // Adding exclusion pattern update behavior, when typing, update search
     $('#swh-admin-deposit-list-exclude-filter').keyup(function() {
       depositsTable.draw();
     });
     // at last draw the table
     depositsTable.draw();
   });
 
   $('a.toggle-col').on('click', function(e) {
     e.preventDefault();
     var column = depositsTable.column($(this).attr('data-column'));
     column.visible(!column.visible());
     if (column.visible()) {
       $(this).removeClass('col-hidden');
     } else {
       $(this).addClass('col-hidden');
     }
   });
 
 }