diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp
index 7395f380d..c20c85be9 100644
--- a/src/gui/EntryPreviewWidget.cpp
+++ b/src/gui/EntryPreviewWidget.cpp
@@ -168,13 +168,12 @@ void EntryPreviewWidget::updateEntryTotp()
 void EntryPreviewWidget::setPasswordVisible(bool state)
 {
     const QString password = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->password());
-    auto flags = m_ui->entryPasswordLabel->textInteractionFlags();
     if (state) {
         m_ui->entryPasswordLabel->setRawText(password);
         m_ui->entryPasswordLabel->setToolTip(password);
-        m_ui->entryPasswordLabel->setTextInteractionFlags(flags | Qt::TextSelectableByMouse);
+        m_ui->entryPasswordLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
     } else {
-        m_ui->entryPasswordLabel->setTextInteractionFlags(flags & ~Qt::TextSelectableByMouse);
+        m_ui->entryPasswordLabel->setTextInteractionFlags(Qt::NoTextInteraction);
         m_ui->entryPasswordLabel->setToolTip({});
         if (password.isEmpty() && config()->get("security/passwordemptynodots").toBool()) {
             m_ui->entryPasswordLabel->setRawText("");
@@ -194,21 +193,20 @@ void EntryPreviewWidget::setGroupNotesVisible(bool state)
     setNotesVisible(m_ui->groupNotesLabel, m_currentGroup->notes(), state);
 }
 
-void EntryPreviewWidget::setNotesVisible(QLabel* notesLabel, const QString notes, bool state)
+void EntryPreviewWidget::setNotesVisible(QLabel* notesLabel, const QString& notes, bool state)
 {
-    auto flags = notesLabel->textInteractionFlags();
     if (state) {
-        notesLabel->setText(notes);
-        notesLabel->setToolTip(notes);
-        notesLabel->setTextInteractionFlags(flags | Qt::TextSelectableByMouse);
+        // Add html hyperlinks to notes that start with XXXX://
+        QString hyperlinkNotes = notes;
+        notesLabel->setText(hyperlinkNotes.replace(QRegExp("(\\w+:\\/\\/\\S+)"), "<a href=\"\\1\">\\1</a>"));
+        notesLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     } else {
         if (notes.isEmpty()) {
             notesLabel->setText("");
         } else {
             notesLabel->setText(QString("\u25cf").repeated(6));
         }
-        notesLabel->setToolTip({});
-        notesLabel->setTextInteractionFlags(flags & ~Qt::TextSelectableByMouse);
+        notesLabel->setTextInteractionFlags(Qt::NoTextInteraction);
     }
 }
 
diff --git a/src/gui/EntryPreviewWidget.h b/src/gui/EntryPreviewWidget.h
index 205b3cbbf..ddf17b295 100644
--- a/src/gui/EntryPreviewWidget.h
+++ b/src/gui/EntryPreviewWidget.h
@@ -54,7 +54,7 @@ private slots:
     void setPasswordVisible(bool state);
     void setEntryNotesVisible(bool state);
     void setGroupNotesVisible(bool state);
-    void setNotesVisible(QLabel* notesLabel, const QString notes, bool state);
+    void setNotesVisible(QLabel* notesLabel, const QString& notes, bool state);
 
     void updateGroupHeaderLine();
     void updateGroupGeneralTab();
diff --git a/src/gui/EntryPreviewWidget.ui b/src/gui/EntryPreviewWidget.ui
index b620da659..4d1941fbc 100644
--- a/src/gui/EntryPreviewWidget.ui
+++ b/src/gui/EntryPreviewWidget.ui
@@ -463,7 +463,7 @@
                  <string>Notes</string>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignTop|Qt::AlignRight</set>
+                 <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
                 </property>
                </widget>
               </item>
@@ -502,12 +502,21 @@
                   <property name="text">
                    <string notr="true">notes</string>
                   </property>
+                  <property name="textFormat">
+                   <enum>Qt::RichText</enum>
+                  </property>
                   <property name="alignment">
                    <set>Qt::AlignTop</set>
                   </property>
                   <property name="wordWrap">
                    <bool>true</bool>
                   </property>
+                  <property name="openExternalLinks">
+                   <bool>true</bool>
+                  </property>
+                  <property name="textInteractionFlags">
+                   <set>Qt::NoTextInteraction</set>
+                  </property>
                  </widget>
                 </item>
                </layout>
@@ -828,7 +837,7 @@
           <layout class="QVBoxLayout" name="verticalLayout_8">
            <item>
             <widget class="QWidget" name="groupGeneralWidget" native="true">
-             <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0">
+             <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0">
               <property name="leftMargin">
                <number>0</number>
               </property>
@@ -971,7 +980,7 @@
                  <string>Notes</string>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignTop|Qt::AlignRight</set>
+                 <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
                 </property>
                </widget>
               </item>