diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index bc077922e..e46fc3d62 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -234,10 +234,13 @@ void Entry::setIcon(const Uuid& uuid)
 {
     Q_ASSERT(!uuid.isNull());
 
-    if (set(m_customIcon, uuid)) {
+    if (m_customIcon != uuid) {
+        m_customIcon = uuid;
         m_iconNumber = 0;
 
         m_pixmapCacheKey = QPixmapCache::Key();
+
+        Q_EMIT modified();
     }
 }