diff --git a/modules/client_entergame/characterlist.lua b/modules/client_entergame/characterlist.lua
index b9762023..a2a4f354 100644
--- a/modules/client_entergame/characterlist.lua
+++ b/modules/client_entergame/characterlist.lua
@@ -171,7 +171,7 @@ end
 
 function CharacterList.create(characters, account, otui)
   if not otui then otui = 'characterlist.otui' end
-  
+
   if charactersWindow then
     charactersWindow:destroy()
   end
@@ -243,7 +243,7 @@ function CharacterList.destroy()
 end
 
 function CharacterList.show()
-  if not loadBox and not errorBox and charactersWindow then
+  if not loadBox and not errorBox then
     charactersWindow:show()
     charactersWindow:raise()
     charactersWindow:focus()
diff --git a/modules/client_entergame/characterlist.otui b/modules/client_entergame/characterlist.otui
index 07b6c187..7e0d011f 100644
--- a/modules/client_entergame/characterlist.otui
+++ b/modules/client_entergame/characterlist.otui
@@ -46,7 +46,7 @@ MainWindow
   size: 250 248
   visible: false
   @onEnter: CharacterList.doLogin()
-  @onEscape: CharacterList.destroy()
+  @onEscape: CharacterList.hide()
   @onSetup: |
     g_keyboard.bindKeyPress('Up', function() self:getChildById('characters'):focusPreviousChild(KeyboardFocusReason) end, self)
     g_keyboard.bindKeyPress('Down', function() self:getChildById('characters'):focusNextChild(KeyboardFocusReason) end, self)