diff --git a/src/main/java/es/kauron/jstudy/controller/TestController.java b/src/main/java/es/kauron/jstudy/controller/TestController.java
index 43ef6c9..e958620 100644
--- a/src/main/java/es/kauron/jstudy/controller/TestController.java
+++ b/src/main/java/es/kauron/jstudy/controller/TestController.java
@@ -75,8 +75,9 @@ public class TestController implements Initializable {
     private void onSkipAction(ActionEvent event) {
         answer.setText("");
         int previous = current;
-        while (list.size() > 1 && current == previous)
+        do
             current = (int) (Math.random() * list.size());
+        while (list.size() > 1 && current == previous);
         question.setText(list.get(current).getQuestion());
         answer.requestFocus();
     }