diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index f9aa9d142b..9240d0c098 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -33,6 +33,7 @@
 #include <QtConcurrentFilter>
 
 const int Group::DefaultIconNumber = 48;
+const int Group::OpenFolderIconNumber = 49;
 const int Group::RecycleBinIconNumber = 43;
 const QString Group::RootAutoTypeSequence = "{USERNAME}{TAB}{PASSWORD}{ENTER}";
 
@@ -1132,7 +1133,8 @@ void Group::applyGroupIconOnCreateTo(Entry* entry)
         return;
     }
 
-    if (iconNumber() == Group::DefaultIconNumber && iconUuid().isNull()) {
+    if ((iconNumber() == Group::DefaultIconNumber || iconNumber() == Group::OpenFolderIconNumber)
+        && iconUuid().isNull()) {
         return;
     }
 
diff --git a/src/core/Group.h b/src/core/Group.h
index 4e7f7cb0c6..8e04a6062b 100644
--- a/src/core/Group.h
+++ b/src/core/Group.h
@@ -110,6 +110,7 @@ class Group : public ModifiableObject
     bool equals(const Group* other, CompareItemOptions options) const;
 
     static const int DefaultIconNumber;
+    static const int OpenFolderIconNumber;
     static const int RecycleBinIconNumber;
     static const QString RootAutoTypeSequence;