diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java
index fe6b85329df87132e649af1bf3b7f6e12751a101..7a5d18b58259717f7caea14843cec66359217d3e 100644
--- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java
@@ -834,10 +834,10 @@ public class ExoneraTorServlet extends HttpServlet {
     for (String[] tableRow : tableRows) {
       out.print("              <tr>");
       for (int i = 0; i < tableRow.length; i++) {
+        String attributes = "";
         String content = tableRow[i];
         if (i == 2) {
-          content = content.substring(0, 20) + "&#8203;"
-              + content.substring(20, 40);
+          attributes = " class=\"fingerprint\"";
         } else if (i == 3 && content == null) {
           content = "("
               + rb.getString("technicaldetails.nickname.unknown") + ")";
@@ -850,7 +850,7 @@ public class ExoneraTorServlet extends HttpServlet {
             content = rb.getString("technicaldetails.exit.no");
           }
         }
-        out.print("                <td>" + content + "</td>");
+        out.print("                <td" + attributes + ">" + content + "</td>");
       }
       out.print("              </tr>\n");
     }
diff --git a/src/main/webapp/css/exonerator.css b/src/main/webapp/css/exonerator.css
index a94fd5456648c979c3e7f51469950b253ddf3907..386d49e4801878c39d9d087b449c2103ac660827 100644
--- a/src/main/webapp/css/exonerator.css
+++ b/src/main/webapp/css/exonerator.css
@@ -25,6 +25,11 @@ body {
   margin-bottom: 15px;
 }
 
+.fingerprint {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
 pre {
   white-space: pre-wrap;
 }