diff --git a/src/client/conversation-list/conversation-list-view.vala b/src/client/conversation-list/conversation-list-view.vala
index 0a082563..f1e0cab1 100644
--- a/src/client/conversation-list/conversation-list-view.vala
+++ b/src/client/conversation-list/conversation-list-view.vala
@@ -167,9 +167,9 @@ public class ConversationList.View : Gtk.ScrolledWindow, Geary.BaseInterface {
 
         int index = row.get_index();
         if (scroll_type == Gtk.ScrollType.STEP_UP) {
-            row = this.list.get_row_at_index(index + 1);
-        } else {
             row = this.list.get_row_at_index(index - 1);
+        } else {
+            row = this.list.get_row_at_index(index + 1);
         }
 
         if (row != null) {