diff --git a/components/CharacterUnit/index.tsx b/components/CharacterUnit/index.tsx
index e70061f1..f2d115b7 100644
--- a/components/CharacterUnit/index.tsx
+++ b/components/CharacterUnit/index.tsx
@@ -295,18 +295,7 @@ const CharacterUnit = ({
       />
     )
 
-    if (gridCharacter) {
-      image = (
-        <CharacterHovercard
-          gridCharacter={gridCharacter}
-          onTriggerClick={openSearchModal}
-        >
-          {image}
-        </CharacterHovercard>
-      )
-    }
-
-    return (
+    const content = (
       <div
         className="CharacterImage"
         tabIndex={gridCharacter ? gridCharacter.position * 7 : 0}
@@ -322,6 +311,17 @@ const CharacterUnit = ({
         )}
       </div>
     )
+
+    return gridCharacter ? (
+      <CharacterHovercard
+        gridCharacter={gridCharacter}
+        onTriggerClick={openSearchModal}
+      >
+        {content}
+      </CharacterHovercard>
+    ) : (
+      content
+    )
   }
 
   const unitContent = (
diff --git a/components/SummonUnit/index.tsx b/components/SummonUnit/index.tsx
index 3ee7447f..7f939085 100644
--- a/components/SummonUnit/index.tsx
+++ b/components/SummonUnit/index.tsx
@@ -235,18 +235,7 @@ const SummonUnit = ({
       />
     )
 
-    if (gridSummon) {
-      image = (
-        <SummonHovercard
-          gridSummon={gridSummon}
-          onTriggerClick={openSearchModal}
-        >
-          {image}
-        </SummonHovercard>
-      )
-    }
-
-    return (
+    const content = (
       <div className="SummonImage" onClick={openSearchModal}>
         {image}
         {editable ? (
@@ -258,6 +247,14 @@ const SummonUnit = ({
         )}
       </div>
     )
+
+    return gridSummon ? (
+      <SummonHovercard gridSummon={gridSummon} onTriggerClick={openSearchModal}>
+        {content}
+      </SummonHovercard>
+    ) : (
+      content
+    )
   }
 
   const unitContent = (