diff --git a/src/engine/util/util-logging.vala b/src/engine/util/util-logging.vala
index 97f9ab6a..8f7895f9 100644
--- a/src/engine/util/util-logging.vala
+++ b/src/engine/util/util-logging.vala
@@ -78,9 +78,9 @@ namespace Geary.Logging {
                 var parts = debug_var.split(",");
                 if ("fatal-warnings" in parts) {
                     Logging.set_breakpoint_on |= GLib.LogLevelFlags.LEVEL_WARNING;
+                    Logging.set_breakpoint_on |= GLib.LogLevelFlags.LEVEL_CRITICAL;
                 }
                 if ("fatal-criticals" in parts) {
-                    Logging.set_breakpoint_on |= GLib.LogLevelFlags.LEVEL_WARNING;
                     Logging.set_breakpoint_on |= GLib.LogLevelFlags.LEVEL_CRITICAL;
                 }
             }