diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 684279a3cd..4f65a0aed4 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -150,16 +150,12 @@ namespace Avalonia.Controls
             {
                 if (e.Key == Key.Down)
                 {
-                    if (++SelectedIndex >= ItemCount)
-                        SelectedIndex = 0;
-
+                    SelectNext();
                     e.Handled = true;
                 }
                 else if (e.Key == Key.Up)
                 {
-                    if (--SelectedIndex < 0)
-                        SelectedIndex = ItemCount - 1;
-
+                    SelectPrev();
                     e.Handled = true;
                 }
             }
@@ -187,15 +183,10 @@ namespace Avalonia.Controls
                     if (IsFocused)
                     {
                         if (e.Delta.Y < 0)
-                        {
-                            if (++SelectedIndex >= ItemCount)
-                                SelectedIndex = 0;
-                        }
+                            SelectNext();
                         else
-                        {
-                            if (--SelectedIndex < 0)
-                                SelectedIndex = ItemCount - 1;
-                        }
+                            SelectPrev();
+
                         e.Handled = true;
                     }
                 }
@@ -358,5 +349,25 @@ namespace Avalonia.Controls
                 }
             }
         }
+
+        private void SelectNext()
+        {
+            int next = SelectedIndex + 1;
+
+            if (next >= ItemCount)
+                next = 0;
+
+            SelectedIndex = next;
+        }
+
+        private void SelectPrev()
+        {
+            int prev = SelectedIndex - 1;
+
+            if (prev < 0)
+                prev = ItemCount - 1;
+
+            SelectedIndex = prev;
+        }
     }
 }