diff --git a/readthedocsext/theme/templates/builds/partials/version_list.html b/readthedocsext/theme/templates/builds/partials/version_list.html
index d02f966f..cd34aa41 100644
--- a/readthedocsext/theme/templates/builds/partials/version_list.html
+++ b/readthedocsext/theme/templates/builds/partials/version_list.html
@@ -183,7 +183,7 @@
   {% with build=object.last_build %}
     {% if build %}
       <div class="item">
-        {% include "includes/elements/chips/build.html" with build=build text=object.project.name %}
+        {% include "includes/elements/chips/build.html" with build=build notext=True %}
       </div>
     {% endif %}
   {% endwith %}
diff --git a/readthedocsext/theme/templates/includes/elements/chips/build.html b/readthedocsext/theme/templates/includes/elements/chips/build.html
index 0d487891..aa62a52d 100644
--- a/readthedocsext/theme/templates/includes/elements/chips/build.html
+++ b/readthedocsext/theme/templates/includes/elements/chips/build.html
@@ -19,7 +19,9 @@
     instance was deleted at some point. The version name is stored on the build
     in this scenario.
   {% endcomment %}
-  {% firstof text build.get_version_name %}
+  {% if not notext %}
+    {% firstof text build.get_version_name %}
+  {% endif %}
 {% endblock chip_text %}
 
 {% block chip_detail_text %}
@@ -30,7 +32,7 @@
   {% comment %}
     This block is the same as the chip_text block above.
   {% endcomment %}
-  {% firstof text build.get_version_name %} #{{ build.id }}
+  Build <a href="{% url 'builds_detail' build.project.slug build.pk %}">#{{ build.id }}</a>
 {% endblock popupcard_header %}
 
 {% block popupcard_right %}
@@ -53,7 +55,7 @@
   {% if build.commit %}
     <span>
       <i class="fad fa-code-commit icon"></i>
-      {{ build.commit|slice:"0:8" }}
+      <a href="{{ build.get_commit_url }}">{{ build.commit|slice:"0:8" }}</a>
     </span>
   {% endif %}
   <div class="right floated">