diff --git a/include/class.orm.php b/include/class.orm.php
index 1638d8b97de68423fd079d3ee8733705e3582aa0..f816265e326e1014eac1ec9407713784d7534577 100644
--- a/include/class.orm.php
+++ b/include/class.orm.php
@@ -1029,7 +1029,7 @@ class QuerySet implements IteratorAggregate, ArrayAccess, Serializable, Countabl
     }
 
     function isWindowed() {
-        return $this->limit || $this->offset;
+        return $this->limit || $this->offset || (count($this->values) + count($this->annotations) + @count($this->extra['select'])) > 1;
     }
 
     function select_related() {