diff --git a/src/core/window.c b/src/core/window.c
index b5a945f..aff3db2 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2024,7 +2024,6 @@ meta_window_queue (MetaWindow *window, guint queuebits)
            * let's check to see whether an idle handler exists to do
            * that. If not, we'll create one.
            */
-
           if (queue_idle[queuenum] == 0)
             queue_idle[queuenum] = g_idle_add_full
               (
@@ -3613,6 +3612,17 @@ meta_window_move_resize_internal (MetaWindow          *window,
 
   meta_window_get_client_root_coords (window, &old_rect);
 
+  /* We don't want move/resize override redirect windows */
+  if (window->override_redirect)
+    {
+      meta_verbose ("Move/resize called on override redirect window %s to %d,%d %dx%d%s%s from %d,%d %dx%d!\n",
+                    window->desc, root_x_nw, root_y_nw, w, h,
+                    is_configure_request ? " (configure request)" : "",
+                    is_user_action ? " (user move/resize)" : "",
+                    old_rect.x, old_rect.y, old_rect.width, old_rect.height);
+      return;
+    }
+
   meta_topic (META_DEBUG_GEOMETRY,
               "Move/resize %s to %d,%d %dx%d%s%s from %d,%d %dx%d\n",
               window->desc, root_x_nw, root_y_nw, w, h,
