diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index d7916e104..dd4bfaa08 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -1102,7 +1102,7 @@ _e_app_cb_monitor(void *data, Ecore_File_Monitor *em,
 		  _e_app_fields_fill(a2, path);
 		  _e_app_change(a2, E_APP_CHANGE);
 
-		  for (l = a2->references; l; l = evas_list_next(l))
+		  for (l = a2->references; l; l = l = l->next)
 		    {
 		       E_App *a3;
 
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 81dcfb05b..893d51db5 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -403,7 +403,10 @@ e_hints_window_init(E_Border *bd)
 	e_border_maximize(bd, e_config->maximize_policy);
      }
    if (bd->client.netwm.state.fullscreen)
-     e_border_fullscreen(bd);
+     {
+	e_hints_window_saved_size_get(bd);
+	e_border_fullscreen(bd);
+     }
    if ((bd->client.icccm.state == ECORE_X_WINDOW_STATE_HINT_ICONIC)
        && (bd->client.netwm.state.hidden))
      e_border_iconify(bd);