diff --git a/src/lib/ecore_win32/ecore_win32.c b/src/lib/ecore_win32/ecore_win32.c
index d7e4961830..cd75bee28f 100644
--- a/src/lib/ecore_win32/ecore_win32.c
+++ b/src/lib/ecore_win32/ecore_win32.c
@@ -278,6 +278,7 @@ _ecore_win32_window_procedure(HWND   window,
      case WM_WINDOWPOSCHANGED:
        INF("position changed window message");
        _ecore_win32_event_handle_configure_notify(data);
+       _ecore_win32_event_handle_property_notify(data);
        _ecore_win32_event_handle_expose(data);
        return 0;
      case WM_ENTERSIZEMOVE:
diff --git a/src/lib/ecore_win32/ecore_win32_event.c b/src/lib/ecore_win32/ecore_win32_event.c
index dfd44de6f9..a22fbed992 100644
--- a/src/lib/ecore_win32/ecore_win32_event.c
+++ b/src/lib/ecore_win32/ecore_win32_event.c
@@ -1893,6 +1893,22 @@ _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg)
    ecore_event_add(ECORE_WIN32_EVENT_WINDOW_RESIZE, e, NULL, NULL);
 }
 
+void
+_ecore_win32_event_handle_property_notify(Ecore_Win32_Callback_Data *msg)
+{
+   Ecore_Win32_Event_Window_Property *e;
+
+   INF("window property");
+
+   e = calloc(1, sizeof(Ecore_Win32_Event_Window_Property));
+   if (!e) return;
+
+   e->window = (void *)GetWindowLongPtr(msg->window, GWLP_USERDATA);
+   e->timestamp = _ecore_win32_event_last_time;
+
+   ecore_event_add(ECORE_WIN32_EVENT_WINDOW_PROPERTY, e, NULL, NULL);
+}
+
 void
 _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg)
 {
diff --git a/src/lib/ecore_win32/ecore_win32_private.h b/src/lib/ecore_win32/ecore_win32_private.h
index 9bc35e0ce7..bb22b466f5 100644
--- a/src/lib/ecore_win32/ecore_win32_private.h
+++ b/src/lib/ecore_win32/ecore_win32_private.h
@@ -157,6 +157,7 @@ void  _ecore_win32_event_handle_map_notify(Ecore_Win32_Callback_Data *msg);
 void  _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg);
 void  _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg);
 void  _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg);
+  void _ecore_win32_event_handle_property_notify(Ecore_Win32_Callback_Data *msg);
 void  _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg);
 void  _ecore_win32_event_handle_selection_notify(Ecore_Win32_Callback_Data *msg);
 
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 12253ee11b..4f7901d209 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -51,7 +51,7 @@
 
 #ifdef BUILD_ECORE_EVAS_WIN32
 
-#define ECORE_EVAS_EVENT_COUNT 10
+#define ECORE_EVAS_EVENT_COUNT 11
 
 static int _ecore_evas_init_count = 0;
 
@@ -91,6 +91,8 @@ static Eina_Bool _ecore_evas_win32_event_window_configure(void *data EINA_UNUSED
 
 static Eina_Bool _ecore_evas_win32_event_window_delete_request(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
 
+static Eina_Bool _ecore_evas_win32_event_window_property_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event);
+
 /* Private functions */
 
 static int
@@ -154,6 +156,7 @@ _ecore_evas_win32_init(void)
    ecore_evas_event_handlers[7]  = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_HIDE, _ecore_evas_win32_event_window_hide, NULL);
    ecore_evas_event_handlers[8]  = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_CONFIGURE, _ecore_evas_win32_event_window_configure, NULL);
    ecore_evas_event_handlers[9]  = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, _ecore_evas_win32_event_window_delete_request, NULL);
+   ecore_evas_event_handlers[10]  = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_PROPERTY, _ecore_evas_win32_event_window_property_change, NULL);
 
    ecore_event_evas_init();
    return _ecore_evas_init_count;
@@ -460,6 +463,104 @@ _ecore_evas_win32_event_window_delete_request(void *data EINA_UNUSED, int type E
    return ECORE_CALLBACK_PASS_ON;
 }
 
+static Eina_Bool
+_ecore_evas_win32_event_window_property_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   struct {
+      struct {
+         unsigned char fullscreen : 1;
+      } win32;
+      struct {
+         Eina_Bool fullscreen : 1;
+      } prop;
+   } prev;
+   Ecore_Evas *ee;
+   Ecore_Win32_Event_Window_Property *e;
+   Ecore_Evas_Engine_Data_Win32 *wdata;
+   Ecore_Win32_Window_State *state;
+   unsigned int num;
+   unsigned int i;
+
+   INF("window property");
+
+   e = event;
+   ee = ecore_event_window_match((Ecore_Window)e->window);
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   wdata = ee->engine.data;
+
+   prev.win32.fullscreen = wdata->state.fullscreen;
+
+   prev.prop.fullscreen = ee->prop.fullscreen;
+
+   wdata->state.fullscreen = 0;
+
+   ee->prop.fullscreen = EINA_FALSE;
+
+   /* we get the states status */
+   ecore_win32_window_state_get(e->window, &state, &num);
+   if (state)
+     {
+        for (i = 0; i < num; i++)
+          {
+             switch (state[i])
+               {
+                case ECORE_WIN32_WINDOW_STATE_FULLSCREEN:
+                   ee->prop.fullscreen = 1;
+                   wdata->state.fullscreen = 1;
+                   break;
+                default:
+                   break;
+               }
+          }
+     }
+
+   if ((prev.win32.fullscreen != wdata->state.fullscreen) ||
+       (prev.prop.fullscreen != ee->prop.fullscreen))
+     {
+        if (ee->func.fn_state_change)
+          ee->func.fn_state_change(ee);
+     }
+
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+/* FIXME, should be in idler */
+static void
+_ecore_evas_win32_state_update(Ecore_Evas *ee)
+{
+   Ecore_Win32_Window_State state[10];
+   Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
+   int num = 0;
+
+   if (ee->prop.modal)
+     state[num++] = ECORE_WIN32_WINDOW_STATE_MODAL;
+   if (ee->prop.sticky)
+     state[num++] = ECORE_WIN32_WINDOW_STATE_STICKY;
+   if (ee->prop.maximized)
+     state[num++] = ECORE_WIN32_WINDOW_STATE_MAXIMIZED_VERT;
+   if (ee->prop.maximized)
+     state[num++] = ECORE_WIN32_WINDOW_STATE_MAXIMIZED_HORZ;
+//   if (bd->client.netwm.state.shaded)
+//     state[num++] = ECORE_WIN32_WINDOW_STATE_SHADED;
+   /* if (ee->prop.focus_skip) */
+   /*   state[num++] = ECORE_WIN32_WINDOW_STATE_SKIP_TASKBAR; */
+   /* if (ee->prop.focus_skip) */
+   /*   state[num++] = ECORE_WIN32_WINDOW_STATE_SKIP_PAGER; */
+//   if (bd->client.netwm.state.hidden)
+//     state[num++] = ECORE_WIN32_WINDOW_STATE_HIDDEN;
+   if (edata->state.fullscreen)
+     state[num++] = ECORE_WIN32_WINDOW_STATE_FULLSCREEN;
+   /* if (edata->state.above) */
+   /*   state[num++] = ECORE_WIN32_WINDOW_STATE_ABOVE; */
+   /* if (edata->state.below) */
+   /*   state[num++] = ECORE_WIN32_WINDOW_STATE_BELOW; */
+   /* if (ee->prop.demand_attention) */
+   /*   state[num++] = ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION; */
+
+   ecore_win32_window_state_set((Ecore_Win32_Window *)ee->prop.window, state, num);
+}
+
 
 /* Ecore_Evas interface */
 
@@ -911,26 +1012,22 @@ _ecore_evas_win32_override_set(Ecore_Evas *ee, Eina_Bool on)
 static void
 _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
 {
-   Ecore_Win32_Window *window;
    Ecore_Evas_Engine_Data_Win32 *wdata = ee->engine.data;
 
    INF("ecore evas fullscreen set");
 
    if (ee->prop.fullscreen == !!on) return;
 
-   wdata->state.fullscreen = on;
-   ee->prop.fullscreen = on;
+   wdata->state.fullscreen = !!on;
+   if (ee->should_be_visible)
+     {
+        struct _Ecore_Win32_Window *window;
 
-   window = (Ecore_Win32_Window *)ee->prop.window;
-
-   if (on != 0)
-   {
-      ecore_win32_window_fullscreen_set(window, on);
-   }
+        window = (Ecore_Win32_Window *)ee->prop.window;
+        ecore_win32_window_fullscreen_set(window, on);
+     }
    else
-   {
-      ecore_win32_window_fullscreen_set(window, on);
-   }
+     _ecore_evas_win32_state_update(ee);
 
    /* Nothing to be done for the GDI backend at the evas level */