diff --git a/event.c b/event.c
index 44139ccf..c3d1d3ad 100644
--- a/event.c
+++ b/event.c
@@ -373,6 +373,12 @@ event_handle_configurerequest(xcb_configure_request_event_t *ev)
             /* ICCCM 4.1.5 / 4.2.3, if nothing was changed, send an event saying so */
             client_send_configure(c);
     }
+    else if (xembed_getbywin(&globalconf.embedded, ev->window))
+    {
+        /* Ignore this so that systray icons cannot resize themselves.
+         * We decide their size!
+         */
+    }
     else
         event_handle_configurerequest_configure_window(ev);
 }
diff --git a/systray.c b/systray.c
index 55518da8..cfccca56 100644
--- a/systray.c
+++ b/systray.c
@@ -48,8 +48,8 @@ systray_init(void)
                       xscreen->root,
                       -1, -1, 1, 1, 0,
                       XCB_COPY_FROM_PARENT, xscreen->root_visual,
-                      XCB_CW_BACK_PIXEL, (const uint32_t [])
-                      { xscreen->black_pixel });
+                      XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, (const uint32_t [])
+                      { xscreen->black_pixel, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT });
 
     atom_name = xcb_atom_name_by_screen("_NET_SYSTEM_TRAY", globalconf.default_screen);
     if(!atom_name)