diff --git a/modules/client_entergame/characterlist.lua b/modules/client_entergame/characterlist.lua
index e157625f..8da2c6b0 100644
--- a/modules/client_entergame/characterlist.lua
+++ b/modules/client_entergame/characterlist.lua
@@ -104,6 +104,13 @@ function CharacterList.show()
   end
 end
 
+function CharacterList.isVisible()
+  if charactersWindow and charactersWindow:isVisible() then
+    return true
+  end
+  return false
+end
+
 function CharacterList.doLogin()
   local selected = charactersWindow:getChildById('characterList'):getFocusedChild()
   if selected then
diff --git a/modules/client_topmenu/topmenu.otui b/modules/client_topmenu/topmenu.otui
index 2ae1c173..b2f023c8 100644
--- a/modules/client_topmenu/topmenu.otui
+++ b/modules/client_topmenu/topmenu.otui
@@ -26,7 +26,7 @@ TopPanel
     @onClick: |
       if Game.isOnline() then
         CharacterList.show()
-      else
+      elseif not CharacterList.isVisible() then
         EnterGame.show()
       end