diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index ab14365a7..406bf784a 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -207,7 +207,8 @@ e_container_current_get(E_Manager *man)
 	if (con->visible)
 	  return con;
      }
-   return NULL;
+   /* If noone is available, return the first */
+   return (E_Container *con)man->containers->data;
 }
 
 void