diff --git a/src/core/window.c b/src/core/window.c
index 7ae3dada9..df4b9240e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7784,6 +7784,15 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
   if (display->grab_op != META_GRAB_OP_NONE)
     return FALSE;
 
+  /* Some windows might not ask for input, in which case we might be here
+   * because we selected for ButtonPress on the root window. In that case,
+   * we have to take special care not to act for an override-redirect window.
+   *
+   * Consume the event in this case, though, since we don't want it passed
+   * to the compositor or UI. */
+  if (window->override_redirect)
+    return TRUE;
+
   /* We have three passive button grabs:
    * - on any button, without modifiers => focuses and maybe raises the window
    * - on resize button, with modifiers => start an interactive resizing