Focus listener improved