diff --git a/shellpki b/shellpki
index 99e4d99..5591c9c 100755
--- a/shellpki
+++ b/shellpki
@@ -810,21 +810,23 @@ list() {
             -a|--all)
                 list_valid=0
                 list_revoked=0
-                shift;;
+                ;;
             -v|--valid)
                 list_valid=0
                 list_revoked=1
-                shift;;
+                ;;
             -r|--revoked)
                 list_valid=1
                 list_revoked=0
-                shift;;
+                ;;
             -?*)
                 warning "unknow option ${1} (ignored)"
-                shift;;
+                ;;
             *)
-                break;;
+                break
+                ;;
         esac
+        shift
     done
 
     if [ "${list_valid}" -eq 0 ]; then