--- misc/eselect.bashcomp	(revision 402)
+++ misc/eselect.bashcomp	(working copy)
@@ -12,11 +12,10 @@
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     sedcmd='sed -n -e s/^[[:space:]]\+.*1m\([^[:space:]][[:alnum:]-]\+\).*[[:space:]]\+.*$/\1/p'
 
-    if [[ ${COMP_CWORD} -eq 1 ]] || [[ -n "${prev}" && ${prev} == -* ]]
-    then
-        possibles="$(eselect help | ${sedcmd})"
-    elif eselect ${prev} usage &>/dev/null ; then
-        possibles=$(eselect ${prev} usage | ${sedcmd})
+    if [[ ${COMP_CWORD} -eq 1 || ${prev} == -* ]]; then
+        possibles=$(eselect help 2>/dev/null | ${sedcmd})
+    elif [[ ${COMP_CWORD} -eq 2 || ${COMP_WORDS[COMP_CWORD-2]} == -* ]]; then
+        possibles=$(eselect ${prev} usage 2>/dev/null | ${sedcmd})
     fi
 
     [[ -n "${possibles}" ]] && \