diff --git a/default.cfg b/default.cfg
index a2943d5..57a17fb 100644
--- a/default.cfg
+++ b/default.cfg
@@ -2371,7 +2371,7 @@ align_typedef_amp_style         = 0        # unsigned number
 # The span for aligning comments that end lines.
 #
 # 0: Don't align (default).
-align_right_cmt_span            = 1        # unsigned number
+align_right_cmt_span            = 120      # unsigned number
 
 # Minimum number of columns between preceding text and a trailing comment in
 # order for the comment to qualify for being aligned. Must be non-zero to have
@@ -2383,7 +2383,7 @@ align_right_cmt_gap             = 1        # unsigned number
 align_right_cmt_mix             = false    # true/false
 
 # Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
+align_right_cmt_same_level      = true     # true/false
 
 # Minimum column at which to align trailing comments. Comments which are
 # aligned beyond this column, but which can be aligned in a lesser column,