diff --git a/src/core/display-private.h b/src/core/display-private.h
index 9ac6d21a1..d349acae8 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -89,9 +89,6 @@ typedef enum
   /* A Wayland application has a popup open. All events go to
    * the Wayland application. */
   META_EVENT_ROUTE_WAYLAND_POPUP,
-
-  /* The user is clicking on a window button. */
-  META_EVENT_ROUTE_FRAME_BUTTON,
 } MetaEventRoute;
 
 typedef void (* MetaDisplayWindowFunc) (MetaWindow *window,
diff --git a/src/core/events.c b/src/core/events.c
index 00dee866a..8bc122c6a 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -109,7 +109,6 @@ get_window_for_event (MetaDisplay        *display,
       }
     case META_EVENT_ROUTE_WINDOW_OP:
     case META_EVENT_ROUTE_WAYLAND_POPUP:
-    case META_EVENT_ROUTE_FRAME_BUTTON:
       return display->grab_window;
     default:
       g_assert_not_reached ();
@@ -477,8 +476,7 @@ meta_display_handle_event (MetaDisplay        *display,
        * event, and if it doesn't, replay the event to release our
        * own sync grab. */
 
-      if (display->event_route == META_EVENT_ROUTE_WINDOW_OP ||
-          display->event_route == META_EVENT_ROUTE_FRAME_BUTTON)
+      if (display->event_route == META_EVENT_ROUTE_WINDOW_OP)
         {
           bypass_clutter = TRUE;
           bypass_wayland = TRUE;
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index d50167283..93e0176f1 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -330,7 +330,6 @@ sync_focus_surface (MetaWaylandPointer *pointer)
   switch (display->event_route)
     {
     case META_EVENT_ROUTE_WINDOW_OP:
-    case META_EVENT_ROUTE_FRAME_BUTTON:
       /* The compositor has a grab, so remove our focus... */
       meta_wayland_pointer_set_focus (pointer, NULL);
       break;
@@ -509,7 +508,6 @@ default_grab_focus (MetaWaylandPointerGrab *grab,
   switch (display->event_route)
     {
     case META_EVENT_ROUTE_WINDOW_OP:
-    case META_EVENT_ROUTE_FRAME_BUTTON:
       return;
       break;
 
diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c
index 3a54b885b..510baff1e 100644
--- a/src/wayland/meta-wayland-tablet-tool.c
+++ b/src/wayland/meta-wayland-tablet-tool.c
@@ -588,7 +588,6 @@ sync_focus_surface (MetaWaylandTabletTool *tool,
   switch (display->event_route)
     {
     case META_EVENT_ROUTE_WINDOW_OP:
-    case META_EVENT_ROUTE_FRAME_BUTTON:
       /* The compositor has a grab, so remove our focus */
       meta_wayland_tablet_tool_set_focus (tool, NULL, event);
       break;