diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 1867f799b..f6c976df7 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -1432,18 +1432,16 @@ e_hints_window_e_state_get(E_Border *bd)
 {
    /* Remember to update the count if we add more states! */
     Ecore_X_Atom state[1];
-    int num;
+    int num, i;
 
     memset(state, 0, sizeof(state));
-    num = ecore_x_window_prop_card32_get(bd->client.win, E_ATOM_WINDOW_STATE, state, 1);
-    if (num)
+    num = ecore_x_window_prop_card32_get(bd->client.win, E_ATOM_WINDOW_STATE, state, sizeof(state));
+    if (!num) return;
+
+    for (i = 0; (i < num) && (i < sizeof(state)); i++)
       {
-         int i;
-         for (i = 0; i < num; i++)
-           {
-              if (state[i] == E_ATOM_WINDOW_STATE_CENTERED)
-                bd->client.e.state.centered = 1;
-           }
+         if (state[i] == E_ATOM_WINDOW_STATE_CENTERED)
+           bd->client.e.state.centered = 1;
       }
 }