diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 40cf0cb779..3f6d40e399 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -1039,11 +1039,10 @@ _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface
      }
    if ((width > 0) && (height > 0))
      _ecore_wl_window_configure_send(win, width, height, 0);
+   else if (win->fullscreen || win->maximized)
+     _ecore_wl_window_configure_send(win, 0, 0, 0);
    else
-     {
-        if ((win->saved.w != 1) || (win->saved.h != 1))
-          _ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
-     }
+     _ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
 
    if (win->xdg_surface)
      xdg_surface_ack_configure(win->xdg_surface, serial);