diff --git a/src/lib/ecore_x/ecore_x_netwm.c b/src/lib/ecore_x/ecore_x_netwm.c
index 60e8e0315f..a5158b43ae 100644
--- a/src/lib/ecore_x/ecore_x_netwm.c
+++ b/src/lib/ecore_x/ecore_x_netwm.c
@@ -1636,7 +1636,7 @@ ecore_x_netwm_moveresize_request_send(Ecore_X_Window win,
    xev.xclient.data.l[3] = button;
    xev.xclient.data.l[4] = 1;
 
-   XSendEvent(_ecore_x_disp, win, False,
+   XSendEvent(_ecore_x_disp, DefaultRootWindow(_ecore_x_disp), False,
               SubstructureNotifyMask | SubstructureRedirectMask, &xev);
    if (_ecore_xlib_sync) ecore_x_sync();
 }
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 843b06d01f..d261d39953 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -3712,8 +3712,13 @@ _elm_win_xwin_update(Efl_Ui_Win_Data *sd)
                                                    sd->wm_rot.preferred_rot);
 
 #ifdef HAVE_ELEMENTARY_X
+   const char *engine_name = ecore_evas_engine_name_get(sd->ee);
+   if (engine_name) _elm_win_need_frame_adjust(sd, engine_name);
    if (sd->csd.need && sd->x.xwin)
-     TRAP(sd, borderless_set, EINA_TRUE);
+     {
+        TRAP(sd, borderless_set, EINA_TRUE);
+        ecore_x_mwm_borderless_set(sd->x.xwin, EINA_TRUE);
+     }
 #endif
 }