diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 5407706c0..62134fdc9 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -143,6 +143,11 @@
         return;
     
     static NSUInteger currentIndex = 0;
+    
+    NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
+    const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
+                                || [scroller knobProportion] == 1.0;
+    
     for (tr_msg_list * currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
     {
         NSString * name = currentMessage->name != NULL ? [NSString stringWithUTF8String: currentMessage->name]
@@ -162,9 +167,6 @@
     
     tr_freeMessageList(messages);
     
-    NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
-    const BOOL shouldScroll = [scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0;
-    
     NSUInteger total = [fMessages count];
     if (total > MAX_MESSAGES)
     {