diff --git a/cheats2.cpp b/cheats2.cpp
index 8f8ac473..7d2080a9 100644
--- a/cheats2.cpp
+++ b/cheats2.cpp
@@ -518,10 +518,14 @@ int S9xModifyCheatGroup(uint32 num, const std::string &name, const std::string &
 	if (num >= Cheat.group.size())
 		return -1;
 
+    bool enabled = Cheat.group[num].enabled;
     S9xDisableCheatGroup(num);
 
     Cheat.group[num] = S9xCreateCheatGroup(name, cheat);
 
+    if (enabled)
+        S9xEnableCheatGroup(num);
+
     return num;
 }
 
diff --git a/qt/src/CheatsDialog.cpp b/qt/src/CheatsDialog.cpp
index d260b1d5..7073d33d 100644
--- a/qt/src/CheatsDialog.cpp
+++ b/qt/src/CheatsDialog.cpp
@@ -63,7 +63,7 @@ void CheatsDialog::addCode()
     if (description.empty())
         description = tr("No description").toStdString();
 
-    if (app->addCheat(description, code))
+    if (!app->addCheat(description, code))
     {
         QMessageBox::information(this, tr("Invalid Cheat"), tr("The cheat you entered was not valid."));
         return;