diff --git a/src/core/display.c b/src/core/display.c
index 24d25966b..9e7f13fa1 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1735,7 +1735,8 @@ event_callback (XEvent   *event,
     }
 #endif /* HAVE_SHAPE */
 
-  if (window && ((event->type == KeyPress) || (event->type == ButtonPress)))
+  if (window && !window->override_redirect &&
+      ((event->type == KeyPress) || (event->type == ButtonPress)))
     {
       if (CurrentTime == display->current_time)
         {