diff --git a/bin/v-commander b/bin/v-commander
index 3d4954763..1747a5ecf 100644
--- a/bin/v-commander
+++ b/bin/v-commander
@@ -119,15 +119,20 @@ apt_update() {
 }
 
 COUNTER=0
+HAS_PARAMETERS=0
 
 while true
 do
 
     COUNTER=$((COUNTER + 1))
     if [ $COUNTER -le $numargs ]; then
+        HAS_PARAMETERS=1
         answer=$1
         shift
     else
+        if [ $HAS_PARAMETERS -eq 1 ]; then
+            exit;
+        fi
         read -p 'What to do: ' answer
     fi
 
@@ -602,8 +607,4 @@ do
         echo "======"
     fi
 
-    if [ $numargs -gt 0 ]; then
-        exit;
-    fi
-
 done