diff --git a/src/autotype/mac/AutoTypeMac.cpp b/src/autotype/mac/AutoTypeMac.cpp
index 89435c263..51a5c5cda 100644
--- a/src/autotype/mac/AutoTypeMac.cpp
+++ b/src/autotype/mac/AutoTypeMac.cpp
@@ -403,12 +403,12 @@ uint16 AutoTypePlatformMac::qtToNativeKeyCode(Qt::Key key)
 //
 CGEventFlags AutoTypePlatformMac::qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool native)
 {
-    CGEventFlags nativeModifiers = 0;
+    CGEventFlags nativeModifiers = CGEventFlags(0);
 
-    CGEventFlags shiftMod = shiftKey;
-    CGEventFlags cmdMod = cmdKey;
-    CGEventFlags optionMod = optionKey;
-    CGEventFlags controlMod = controlKey;
+    CGEventFlags shiftMod = CGEventFlags(shiftKey);
+    CGEventFlags cmdMod = CGEventFlags(cmdKey);
+    CGEventFlags optionMod = CGEventFlags(optionKey);
+    CGEventFlags controlMod = CGEventFlags(controlKey);
 
     if (native) {
         shiftMod = kCGEventFlagMaskShift;
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index e074df6cb..c0876daa5 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -113,6 +113,7 @@ void Config::init(const QString& fileName)
     m_defaults.insert("UseGroupIconOnEntryCreation", false);
     m_defaults.insert("AutoTypeEntryTitleMatch", true);
     m_defaults.insert("UseGroupIconOnEntryCreation", true);
+    m_defaults.insert("IgnoreGroupExpansion", false);
     m_defaults.insert("security/clearclipboard", true);
     m_defaults.insert("security/clearclipboardtimeout", 10);
     m_defaults.insert("security/lockdatabaseidle", false);
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index d8d609987..bd4f8851b 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -296,6 +296,9 @@ void Group::setExpanded(bool expanded)
     if (m_data.isExpanded != expanded) {
         m_data.isExpanded = expanded;
         updateTimeinfo();
+        if (config()->get("IgnoreGroupExpansion").toBool()) {
+            return;
+        }
         emit modified();
     }
 }
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index 19dae371d..716eb14f1 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -115,6 +115,7 @@ void SettingsWidget::loadSettings()
     m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool());
     m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation").toBool());
     m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get("AutoTypeEntryTitleMatch").toBool());
+    m_generalUi->ignoreGroupExpansionCheckBox->setChecked(config()->get("IgnoreGroupExpansion").toBool());
 
     m_generalUi->languageComboBox->clear();
     QList<QPair<QString, QString> > languages = Translator::availableLanguages();
@@ -180,6 +181,8 @@ void SettingsWidget::saveSettings()
     config()->set("MinimizeOnCopy", m_generalUi->minimizeOnCopyCheckBox->isChecked());
     config()->set("UseGroupIconOnEntryCreation",
                   m_generalUi->useGroupIconOnEntryCreationCheckBox->isChecked());
+    config()->set("IgnoreGroupExpansion",
+                  m_generalUi->ignoreGroupExpansionCheckBox->isChecked());
     config()->set("AutoTypeEntryTitleMatch",
                   m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked());
     int currentLangIndex = m_generalUi->languageComboBox->currentIndex();
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index 88d7cad45..37a60912c 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -105,6 +105,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="ignoreGroupExpansionCheckBox">
+         <property name="text">
+          <string>Don't mark database as modified for non-data changes (e.g., expanding groups)</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QWidget" name="systraySettings" native="true">
          <layout class="QVBoxLayout" name="systrayLayout">