diff --git a/reactos/lib/rtl/generictable.c b/reactos/lib/rtl/generictable.c
index 798ad1e58d7..8dce8d686b4 100644
--- a/reactos/lib/rtl/generictable.c
+++ b/reactos/lib/rtl/generictable.c
@@ -451,21 +451,23 @@ RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table,
         {
             /* Do the search backwards, since this takes less iterations */
             DeltaDown = OrderedElement - NextI;
-            do
+            while (DeltaDown)
             {
                 /* Get next node */
                 OrderedNode = OrderedNode->Blink;
-            } while (--DeltaDown);
+                DeltaDown--;
+            }
         }
         else
         {
             /* Follow the list directly instead */
             OrderedNode = &Table->InsertOrderList;
-            do
+            while (NextI)
             {
                 /* Get next node */
                 OrderedNode = OrderedNode->Flink;
-            } while (--NextI);
+                NextI--;
+            }
         }
     }
     else
@@ -478,21 +480,23 @@ RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table,
         if (DeltaUp <= DeltaDown)
         {
             /* Do the search forwards, since this takes less iterations */
-            do
+            while (DeltaUp)
             {
                 /* Get next node */
                 OrderedNode = OrderedNode->Blink;
-            } while (--DeltaUp);
+                DeltaUp--;
+            }
         }
         else
         {
             /* Do the search downwards, since this takes less iterations */
             OrderedNode = &Table->InsertOrderList;
-            do
+            while (DeltaDown)
             {
                 /* Get next node */
                 OrderedNode = OrderedNode->Blink;
-            } while (--DeltaDown);
+                DeltaDown--;
+            }
         }
     }