diff --git a/pynsot/app.py b/pynsot/app.py
index a8d2c13..a3e108d 100644
--- a/pynsot/app.py
+++ b/pynsot/app.py
@@ -167,7 +167,11 @@ def pretty_dict(data, delim='=', sep=', ', joiner='\n'):
                     val = joiner + val  # Prefix it w/ newline for readability
             pretty += '%s%s%s%s' % (key, delim, val, sep)
 
-        return pretty.rstrip(sep)  # Drop the trailing separator
+        pretty = pretty.rstrip(sep) # Drop the trailing separator
+        pretty = pretty.split('\n')
+        pretty.sort()
+        pretty = '\n'.join(pretty)
+        return pretty
 
     def format_message(self, obj_single, message=''):
         """
@@ -333,11 +337,6 @@ def format_field(self, field, field_data):
         elif field == 'change_at':  # Timestamp
             field_data = self.format_timestamp(field_data)
 
-        elif field == 'attributes':
-            field_data = field_data.split('\n')
-            field_data.sort()
-            field_data = '\n'.join(field_data)
-
         return field_data
 
     def format_object_for_grep(self, obj):