diff --git a/script/execute.c b/script/execute.c
index 37686627d..cdfe47337 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -323,7 +323,7 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
   result = 0;
   do {
     cond = grub_script_execute_cmd (cmdwhile->cond);
-    if ((cmdwhile->until && !cond) || (!cmdwhile->until && cond))
+    if (cmdwhile->until ? !cond : cond)
       break;
 
     result = grub_script_execute_cmd (cmdwhile->list);