diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt
index b46d335..b727a2c 100644
--- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt
+++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexCollectionGUI.kt
@@ -355,7 +355,6 @@ class CobbledexCollectionGUI : Screen(cobbledexTextTranslation("cobbledex")) {
                                         tooltip.add(translation)
                                     }
 
-
                                     entryForm.getDiscoveredTimestamp()?.let { timestamp ->
                                         val translation = cobbledexTextTranslation("discovered_on", timestamp)
                                         tooltip.add(translation)
@@ -400,7 +399,6 @@ class CobbledexCollectionGUI : Screen(cobbledexTextTranslation("cobbledex")) {
         {
             val species = if(filteredSpecies.size > entry) filteredSpecies[entry] else null
             if (species != null) {
-                close()
                 playSound(CobblemonSounds.PC_CLICK)
                 CobbledexGUI.openCobbledexScreen(species.standardForm, setOf(),
                     skipSound = true,
diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt
index 184907c..9651f6b 100644
--- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt
+++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/client/gui/CobbledexGUI.kt
@@ -110,9 +110,10 @@ class CobbledexGUI(var selectedPokemon: FormData?, var selectedAspects: Set<Stri
         val y = (height - BASE_HEIGHT) / 2
 
         this.addDrawableChild(ExitButton(pX = x + 315, pY = y + 172) {
-            this.close()
             if (cameFromCollection)
                 CobbledexCollectionGUI.show(true)
+            else
+                this.close()
         })
 
         evolutionDisplay = PokemonEvolutionDisplay(x + 260, y + 37)
diff --git a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt
index 5b38d16..edc1029 100644
--- a/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt
+++ b/common/src/main/kotlin/com/rafacasari/mod/cobbledex/items/CobbledexItem.kt
@@ -81,10 +81,12 @@ class CobbledexItem(settings: Settings) : Item(settings) {
 
                 val target = entity.pokemon
 
-                val discoveryRegister = CobbledexCollectionGUI.discoveredList[target.species.showdownId()]?.contains(target.form.formOnlyShowdownId())
-                if (world.isClient && discoveryRegister == true) {
-                    CobbledexGUI.openCobbledexScreen(target.form, target.aspects)
-                    return TypedActionResult.success(itemStack, false)
+                if (world.isClient) {
+                    val discoveryRegister = CobbledexCollectionGUI.discoveredList[target.species.showdownId()]?.contains(target.form.formOnlyShowdownId())
+                    if (discoveryRegister == true) {
+                        CobbledexGUI.openCobbledexScreen(target.form, target.aspects)
+                        return TypedActionResult.success(itemStack, false)
+                    }
                 }
 
                 if (user is ServerPlayerEntity) {