diff --git a/src/kits/interface/OutlineListView.cpp b/src/kits/interface/OutlineListView.cpp
index 483eac2f87..89b8d6b183 100644
--- a/src/kits/interface/OutlineListView.cpp
+++ b/src/kits/interface/OutlineListView.cpp
@@ -846,8 +846,10 @@ BOutlineListView::ExpandOrCollapse(BListItem* item, bool expand)
 				uint32 subLevel = item->fLevel;
 				items++;
 
-				while (--count > 0 && items[0]->fLevel > subLevel)
+				while (count > 0 && items[0]->fLevel > subLevel) {
 					items++;
+					count--;
+				}
 			} else
 				items++;
 		}