diff --git a/client.c b/client.c
index c9d14e001..dc8a567bc 100644
--- a/client.c
+++ b/client.c
@@ -72,10 +72,10 @@ client_loadprops(client_t * c, screen_t *screen)
     char *prop = NULL;
 
     if(!xutil_gettextprop(globalconf.connection, c->win, &globalconf.atoms,
-                         xutil_intern_atom_reply(globalconf.connection, &globalconf.atoms,
-                                                 xutil_intern_atom(globalconf.connection,
-                                                                   &globalconf.atoms,
-                                                                   "_AWESOME_PROPERTIES")),
+                          xutil_intern_atom_reply(globalconf.connection, &globalconf.atoms,
+                                                  xutil_intern_atom(globalconf.connection,
+                                                                    &globalconf.atoms,
+                                                                    "_AWESOME_PROPERTIES")),
                          &prop))
         return false;
 
diff --git a/systray.c b/systray.c
index a3f0cb0e4..46f3778f6 100644
--- a/systray.c
+++ b/systray.c
@@ -74,7 +74,7 @@ systray_init(int phys_screen)
                             atom_systray,
                             XCB_CURRENT_TIME);
 
-    xcb_send_event(globalconf.connection, false, xscreen->root, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char *) &ev);
+    xcb_send_event(globalconf.connection, false, xscreen->root, XCB_EVENT_MASK_NO_EVENT, (char *) &ev);
 }
 
 /** Handle a systray request.