diff --git a/herbstluftwm/usr/bin/hlwm-run-or-raise b/herbstluftwm/usr/bin/hlwm-run-or-raise
index 0657088..6fe23c8 100755
--- a/herbstluftwm/usr/bin/hlwm-run-or-raise
+++ b/herbstluftwm/usr/bin/hlwm-run-or-raise
@@ -39,7 +39,8 @@ exec scsh -s "$0" "$@"
 
 (if (not (null? window-ids))
     (let ((next-window
-           (if (member current-window-id window-ids)
+           (if (and (> (length window-ids) 1)
+                    (member current-window-id window-ids))
                (cadr (pull-element-to-front current-window-id window-ids))
                (car window-ids))))
       (run (hlwm-switch-to-window ,next-window)))