diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp
index 38afbcf24..45a71a348 100644
--- a/src/gui/EntryPreviewWidget.cpp
+++ b/src/gui/EntryPreviewWidget.cpp
@@ -286,14 +286,18 @@ void EntryPreviewWidget::updateEntryAdvancedTab()
 
     setTabEnabled(m_ui->entryTabWidget, m_ui->entryAdvancedTab, hasAttributes || hasAttachments);
     if (hasAttributes) {
-        QString attributesText;
+        QString attributesText("<table>");
         for (const QString& key : customAttributes) {
-            QString value = m_currentEntry->attributes()->value(key);
+            QString value;
             if (m_currentEntry->attributes()->isProtected(key)) {
                 value = "<i>" + tr("[PROTECTED]") + "</i>";
+            } else {
+                value = m_currentEntry->attributes()->value(key).toHtmlEscaped();
+                value.replace('\n', QLatin1String("<br/>"));
             }
-            attributesText.append(tr("<b>%1</b>: %2", "attributes line").arg(key, value).append("<br/>"));
+            attributesText.append(tr("<tr><td><b>%1</b>:</td><td>%2</td></tr>", "attributes line").arg(key, value));
         }
+        attributesText.append("</table>");
         m_ui->entryAttributesEdit->setText(attributesText);
     }