diff --git a/src/DETHRACE/common/racesumm.c b/src/DETHRACE/common/racesumm.c
index fad590f8..45384ed1 100644
--- a/src/DETHRACE/common/racesumm.c
+++ b/src/DETHRACE/common/racesumm.c
@@ -1041,15 +1041,15 @@ int DamageScrnRight(int* pCurrent_choice, int* pCurrent_mode) {
     if (*pCurrent_mode == 0 && gWreck_zoomed_in < 0) {
         if (gWreck_selected < 0) {
             gWreck_selected = 0;
-        } else if (gWreck_selected - 1 != gWreck_count && gWreck_array[gWreck_selected + 1].pos_y == gWreck_array[gWreck_selected].pos_y) {
-            gWreck_selected++;
-        } else {
+        } else if (gWreck_count - 1 == gWreck_selected || gWreck_array[gWreck_selected + 1].pos_y != gWreck_array[gWreck_selected].pos_y) {
             for (i = 0; i < gWreck_count; i++) {
                 if (gWreck_array[i].pos_y == gWreck_array[gWreck_selected].pos_y) {
                     gWreck_selected = i;
                     break;
                 }
             }
+        } else {
+            gWreck_selected++;
         }
     } else if (gWreck_zoomed_in >= 0) {
         *pCurrent_choice = *pCurrent_choice + 1;