diff --git a/swh/web/assets/src/bundles/webapp/webapp.css b/swh/web/assets/src/bundles/webapp/webapp.css
--- a/swh/web/assets/src/bundles/webapp/webapp.css
+++ b/swh/web/assets/src/bundles/webapp/webapp.css
@@ -558,7 +558,6 @@
     overflow-y: auto;
     overflow-x: auto;
     padding: 0;
-    padding-right: 1.4em;
 }
 
 @media screen and (min-width: 768px) {
@@ -567,18 +566,9 @@
     }
 }
 
-.swh-metadata-table-row {
-    border-top: 1px solid #ddd !important;
-}
-
-.swh-metadata-table-key {
-    min-width: 200px;
-    max-width: 200px;
-    width: 200px;
-}
-
-.swh-metadata-table-value pre {
+.swh-popover pre {
     white-space: pre-wrap;
+    margin-bottom: 0;
 }
 
 .d3-wrapper {
diff --git a/swh/web/templates/includes/show-metadata.html b/swh/web/templates/includes/show-metadata.html
--- a/swh/web/templates/includes/show-metadata.html
+++ b/swh/web/templates/includes/show-metadata.html
@@ -7,31 +7,23 @@
 
 {% load swh_templatetags %}
 
-<button id="metadata-toggler" class="btn btn-default btn-sm swh-popover-toggler" data-toggle="popover" data-popover-content="#metadata-popover">
+{% if 'metadata' in swh_object_metadata and swh_object_metadata.metadata != '{}' %}
+
+<button id="swh-metadata-toggler" class="btn btn-default btn-sm swh-popover-toggler"
+        data-toggle="popover" data-popover-content="#swh-metadata-popover">
   <i class="mdi mdi-table mdi-fw" aria-hidden="true"></i>
   Show metadata
 </button>
 
-<div id="metadata-popover" style="display:none;">
+<div id="swh-metadata-popover" style="display:none;">
   <div class="popover-heading">{{ swh_object_name }} metadata</div>
   <div class="popover-body">
-    <table class="table">
-      <tbody>
-        {% for key, val in swh_object_metadata.items|dictsort:"0.lower" %}
-          {% if val is not None and val != '' %}
-            <tr>
-              <th class="swh-metadata-table-row swh-metadata-table-key">{{ key }}</th>
-              <td class="swh-metadata-table-row swh-metadata-table-value">
-                <pre>{{ val | escape }}</pre>
-              </td>
-            </tr>
-          {% endif %}
-        {% endfor %}
-      </tbody>
-    </table>
+    <pre class="bg-white">{{ swh_object_metadata.metadata | escape }}</pre>
   </div>
 </div>
 
+{% endif %}
+
 <script>
   swh.webapp.setBrowsedSwhObjectMetadata({{ swh_object_metadata|jsonify }})
 </script>
diff --git a/swh/web/tests/browse/views/test_content.py b/swh/web/tests/browse/views/test_content.py
--- a/swh/web/tests/browse/views/test_content.py
+++ b/swh/web/tests/browse/views/test_content.py
@@ -63,6 +63,7 @@
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
+    assert_not_contains(resp, "swh-metadata-popover")
 
 
 @given(content_text_no_highlight())
diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py
--- a/swh/web/tests/browse/views/test_directory.py
+++ b/swh/web/tests/browse/views/test_directory.py
@@ -29,7 +29,7 @@
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import gen_path_info, reverse
-from swh.web.tests.django_asserts import assert_contains
+from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.strategies import (
     directory,
     directory_with_subdirs,
@@ -435,3 +435,5 @@
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
+
+    assert_not_contains(resp, "swh-metadata-popover")
diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py
--- a/swh/web/tests/browse/views/test_origin.py
+++ b/swh/web/tests/browse/views/test_origin.py
@@ -31,7 +31,7 @@
     reverse,
 )
 from swh.web.tests.data import get_content, random_sha1
-from swh.web.tests.django_asserts import assert_contains
+from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.strategies import (
     new_origin,
     new_snapshot,
@@ -991,6 +991,8 @@
 
     _check_origin_link(resp, origin_info["url"])
 
+    assert_not_contains(resp, "swh-metadata-popover")
+
 
 def _origin_directory_view_test_helper(
     client,
@@ -1131,6 +1133,8 @@
 
     _check_origin_link(resp, origin_info["url"])
 
+    assert_not_contains(resp, "swh-metadata-popover")
+
 
 def _origin_branches_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
diff --git a/swh/web/tests/browse/views/test_revision.py b/swh/web/tests/browse/views/test_revision.py
--- a/swh/web/tests/browse/views/test_revision.py
+++ b/swh/web/tests/browse/views/test_revision.py
@@ -3,17 +3,28 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+import json
 import random
 
 from hypothesis import given
 
 from django.utils.html import escape
 
+from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.identifiers import DIRECTORY, REVISION, SNAPSHOT
+from swh.model.model import Revision, RevisionType, TimestampWithTimezone
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import format_utc_iso_date, parse_iso8601_date_to_utc, reverse
-from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import new_origin, origin, revision, unknown_revision
+from swh.web.tests.django_asserts import assert_contains, assert_not_contains
+from swh.web.tests.strategies import (
+    directory,
+    new_origin,
+    new_person,
+    new_swh_date,
+    origin,
+    revision,
+    unknown_revision,
+)
 from swh.web.tests.utils import check_html_get_response
 
 
@@ -291,3 +302,29 @@
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
+    assert_not_contains(resp, "swh-metadata-popover")
+
+
+@given(directory(), new_person(), new_swh_date())
+def test_revision_metadata_display(archive_data, client, directory, person, date):
+    metadata = {"foo": "bar"}
+    revision = Revision(
+        directory=hash_to_bytes(directory),
+        author=person,
+        committer=person,
+        message=b"commit message",
+        date=TimestampWithTimezone.from_datetime(date),
+        committer_date=TimestampWithTimezone.from_datetime(date),
+        synthetic=False,
+        type=RevisionType.GIT,
+        metadata=metadata,
+    )
+    archive_data.revision_add([revision])
+
+    url = reverse("browse-revision", url_args={"sha1_git": hash_to_hex(revision.id)})
+
+    resp = check_html_get_response(
+        client, url, status_code=200, template_used="browse/revision.html"
+    )
+    assert_contains(resp, "swh-metadata-popover")
+    assert_contains(resp, escape(json.dumps(metadata, indent=4)))