diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_vocab_widget.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_vocab_widget.dart
index a7fe9e7f6..0a05e5c47 100644
--- a/lib/pangea/activity_sessions/activity_session_chat/activity_vocab_widget.dart
+++ b/lib/pangea/activity_sessions/activity_session_chat/activity_vocab_widget.dart
@@ -106,27 +106,17 @@ class _VocabChipsState extends State<_VocabChips> with TokenRenderingMixin {
     OverlayUtil.showPositionedCard(
       overlayKey: target,
       context: context,
-      cardToShow: StatefulBuilder(
-        builder: (context, setState) => WordZoomWidget(
-          token: PangeaTokenText(
-            content: v.lemma,
-            length: v.lemma.characters.length,
-            offset: 0,
-          ),
-          construct: ConstructIdentifier(
-            lemma: v.lemma,
-            type: ConstructTypeEnum.vocab,
-            category: v.pos,
-          ),
-          langCode: widget.langCode,
-          onClose: () {
-            MatrixState.pAnyState.closeOverlay(target);
-            setState(() => _selectedVocab = null);
-          },
-          onDismissNewWordOverlay: () {
-            if (mounted) setState(() {});
-          },
-        ),
+      cardToShow: _WordCardWrapper(
+        v: v,
+        langCode: widget.langCode,
+        target: target,
+        onClose: () {
+          if (mounted) {
+            WidgetsBinding.instance.addPostFrameCallback(
+              (_) => setState(() => _selectedVocab = null),
+            );
+          }
+        },
       ),
       transformTargetId: target,
       closePrevOverlay: false,
@@ -204,3 +194,52 @@ class _VocabChipsState extends State<_VocabChips> with TokenRenderingMixin {
     );
   }
 }
+
+class _WordCardWrapper extends StatefulWidget {
+  final Vocab v;
+  final String langCode;
+  final String target;
+  final VoidCallback onClose;
+
+  const _WordCardWrapper({
+    required this.v,
+    required this.langCode,
+    required this.target,
+    required this.onClose,
+  });
+
+  @override
+  State<_WordCardWrapper> createState() => _WordCardWrapperState();
+}
+
+class _WordCardWrapperState extends State<_WordCardWrapper> {
+  @override
+  void dispose() {
+    widget.onClose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WordZoomWidget(
+      token: PangeaTokenText(
+        content: widget.v.lemma,
+        length: widget.v.lemma.characters.length,
+        offset: 0,
+      ),
+      construct: ConstructIdentifier(
+        lemma: widget.v.lemma,
+        type: ConstructTypeEnum.vocab,
+        category: widget.v.pos,
+      ),
+      langCode: widget.langCode,
+      onClose: () {
+        MatrixState.pAnyState.closeOverlay(widget.target);
+        widget.onClose();
+      },
+      onDismissNewWordOverlay: () {
+        if (mounted) setState(() {});
+      },
+    );
+  }
+}