diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index 8fee33587..cf1c504a0 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -1483,9 +1483,8 @@ QUuid Entry::previousParentGroupUuid() const
 
 void Entry::setPreviousParentGroupUuid(const QUuid& uuid)
 {
-    // prevent set from changing the LastModificationTime
     bool prevUpdateTimeinfo = m_updateTimeinfo;
-    m_updateTimeinfo = false;
+    m_updateTimeinfo = false; // prevent update of LastModificationTime
     set(m_data.previousParentGroupUuid, uuid);
     m_updateTimeinfo = prevUpdateTimeinfo;
 }
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index f6b7f03fe..d1df6e94c 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -494,7 +494,11 @@ void Group::setParent(Group* parent, int index, bool trackPrevious)
         m_data.timeInfo.setLocationChanged(Clock::currentDateTimeUtc());
     }
 
+    bool prevUpdateTimeInfo = m_updateTimeinfo;
+    m_updateTimeinfo = false; // prevent update of LastModificationTime
     emitModified();
+    m_updateTimeinfo = prevUpdateTimeInfo;
+    
 
     if (!moveWithinDatabase) {
         emit groupAdded();
@@ -1237,9 +1241,8 @@ QUuid Group::previousParentGroupUuid() const
 
 void Group::setPreviousParentGroupUuid(const QUuid& uuid)
 {
-    // prevent set from changing the LastModificationTime
     bool prevUpdateTimeinfo = m_updateTimeinfo;
-    m_updateTimeinfo = false;
+    m_updateTimeinfo = false; // prevent update of LastModificationTime
     set(m_data.previousParentGroupUuid, uuid);
     m_updateTimeinfo = prevUpdateTimeinfo;
 }