diff --git a/modules/game_modaldialog/modaldialog.lua b/modules/game_modaldialog/modaldialog.lua
index 0cfea436..b23a8641 100644
--- a/modules/game_modaldialog/modaldialog.lua
+++ b/modules/game_modaldialog/modaldialog.lua
@@ -53,7 +53,7 @@ function onModalDialog(id, title, message, buttons, enterButton, escapeButton, c
       labelHeight = label:getHeight()
     end
   end
-  choiceList:focusNextChild()
+  choiceList:focusChild(choiceList:getFirstChild())
 
   local buttonsWidth = 0
   for i = 1, #buttons do
@@ -78,7 +78,6 @@ function onModalDialog(id, title, message, buttons, enterButton, escapeButton, c
   if #choices > 0 then
     choiceList:setVisible(true)
     choiceScrollbar:setVisible(true)
-    choiceList:focusChild(choiceList:getFirstChild())
     
     additionalHeight = math.min(modalDialog.maximumChoices, math.max(modalDialog.minimumChoices, #choices)) * labelHeight
     additionalHeight = additionalHeight + choiceList:getPaddingTop() + choiceList:getPaddingBottom()