diff --git a/qt/Application.h b/qt/Application.h
index 33fe7bbc7..77bd8ebca 100644
--- a/qt/Application.h
+++ b/qt/Application.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <unordered_set>
+
 #include <QApplication>
 #include <QTimer>
 #include <QTranslator>
@@ -15,6 +17,7 @@
 #include "FaviconCache.h"
 #include "Macros.h"
 #include "Typedefs.h"
+#include "Utils.h" // std::hash<QString>
 
 class AddData;
 class Prefs;
@@ -36,6 +39,7 @@ public:
     void raise();
     bool notifyApp(QString const& title, QString const& body) const;
 
+    QString const& intern(QString const& in) { return *interned_strings_.insert(in).first; }
     FaviconCache& faviconCache();
 
 public slots:
@@ -72,6 +76,8 @@ private:
 
     QString const config_name_;
     QString const display_name_;
+
+    std::unordered_set<QString> interned_strings_;
 };
 
 #undef qApp
diff --git a/qt/Torrent.cc b/qt/Torrent.cc
index 87617c76b..38bf0314f 100644
--- a/qt/Torrent.cc
+++ b/qt/Torrent.cc
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <cassert>
 #include <iterator>
+#include <set>
 
 #include <QApplication>
 #include <QString>
@@ -207,18 +208,14 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const*
             HANDLE_KEY(activityDate, activity_date, ACTIVITY_DATE)
             HANDLE_KEY(addedDate, added_date, ADDED_DATE)
             HANDLE_KEY(bandwidthPriority, bandwidth_priority, BANDWIDTH_PRIORITY)
-            HANDLE_KEY(comment, comment, COMMENT)
             HANDLE_KEY(corruptEver, failed_ever, FAILED_EVER)
-            HANDLE_KEY(creator, creator, CREATOR)
             HANDLE_KEY(dateCreated, date_created, DATE_CREATED)
             HANDLE_KEY(desiredAvailable, desired_available, DESIRED_AVAILABLE)
-            HANDLE_KEY(downloadDir, download_dir, DOWNLOAD_DIR)
             HANDLE_KEY(downloadLimit, download_limit, DOWNLOAD_LIMIT) // KB/s
             HANDLE_KEY(downloadLimited, download_limited, DOWNLOAD_LIMITED)
             HANDLE_KEY(downloadedEver, downloaded_ever, DOWNLOADED_EVER)
             HANDLE_KEY(editDate, edit_date, EDIT_DATE)
             HANDLE_KEY(error, error, ERROR)
-            HANDLE_KEY(errorString, error_string, ERROR_STRING)
             HANDLE_KEY(eta, eta, ETA)
             HANDLE_KEY(fileStats, files, FILES)
             HANDLE_KEY(files, files, FILES)
@@ -259,6 +256,22 @@ Torrent::fields_t Torrent::update(tr_quark const* keys, tr_variant const* const*
             HANDLE_KEY(uploadLimited, upload_limited, UPLOAD_LIMITED)
             HANDLE_KEY(uploadedEver, uploaded_ever, UPLOADED_EVER)
             HANDLE_KEY(webseedsSendingToUs, webseeds_sending_to_us, WEBSEEDS_SENDING_TO_US)
+#undef HANDLE_KEY
+
+#define HANDLE_KEY(key, field, bit) case TR_KEY_ ## key: \
+    field_changed = change(field ## _, child); \
+    if (field_changed) \
+    { \
+        field ## _ = qApp->intern(field ## _); \
+    } \
+    changed.set(bit, field_changed); \
+    break;
+
+            HANDLE_KEY(comment, comment, COMMENT)
+            HANDLE_KEY(creator, creator, CREATOR)
+            HANDLE_KEY(downloadDir, download_dir, DOWNLOAD_DIR)
+            HANDLE_KEY(errorString, error_string, ERROR_STRING)
+
 #undef HANDLE_KEY
         default:
             break;
diff --git a/qt/VariantHelpers.cc b/qt/VariantHelpers.cc
index c8091b49d..f40c1422a 100644
--- a/qt/VariantHelpers.cc
+++ b/qt/VariantHelpers.cc
@@ -165,6 +165,7 @@ bool change(TrackerStat& setme, tr_variant const* value)
         {
             if (key == TR_KEY_announce)
             {
+                setme.announce = qApp->intern(setme.announce);
                 setme.favicon_key = qApp->faviconCache().add(setme.announce);
             }