diff --git a/jvm/controls/src/main/kotlin/org/wycliffeassociates/otter/jvm/controls/event/ChunkingPageEvents.kt b/jvm/controls/src/main/kotlin/org/wycliffeassociates/otter/jvm/controls/event/ChunkingPageEvents.kt
index 0fbf82ff71..5c77617aca 100644
--- a/jvm/controls/src/main/kotlin/org/wycliffeassociates/otter/jvm/controls/event/ChunkingPageEvents.kt
+++ b/jvm/controls/src/main/kotlin/org/wycliffeassociates/otter/jvm/controls/event/ChunkingPageEvents.kt
@@ -45,7 +45,8 @@ class GoToPreviousChapterEvent: FXEvent()
 class OpenInPluginEvent: FXEvent()
 
 /**
- * Use this event to avoid unwanted refresh of steps or chunk list
- * when returning from an external plugin.
+ * Use this event to avoid unwanted auto-navigation or state refresh
+ * when returning from an external plugin. Only fire this event inside
+ * onDock() of main view in Translation.
  */
 class ReturnFromPluginEvent: FXEvent()
\ No newline at end of file
diff --git a/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/ChunkingTranslationPage.kt b/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/ChunkingTranslationPage.kt
index b80adbe7e7..408274d355 100644
--- a/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/ChunkingTranslationPage.kt
+++ b/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/ChunkingTranslationPage.kt
@@ -153,7 +153,7 @@ class ChunkingTranslationPage : View() {
         super.onDock()
         when (viewModel.pluginOpenedProperty.value) {
             true -> {
-                // returning from plugin
+                // returning from plugin, notify child view without triggering onDock()
                 FX.eventbus.fire(ReturnFromPluginEvent())
             }
             false -> {
diff --git a/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/translation/BlindDraft.kt b/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/translation/BlindDraft.kt
index d9e1e7502a..45b5d953f6 100644
--- a/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/translation/BlindDraft.kt
+++ b/jvm/workbookapp/src/main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/screens/translation/BlindDraft.kt
@@ -37,6 +37,7 @@ import org.wycliffeassociates.otter.jvm.controls.styles.tryImportStylesheet
 import org.wycliffeassociates.otter.jvm.workbookapp.ui.components.ChunkTakeCard
 import org.wycliffeassociates.otter.jvm.controls.event.ChunkTakeEvent
 import org.wycliffeassociates.otter.jvm.controls.event.RedoChunkingPageEvent
+import org.wycliffeassociates.otter.jvm.controls.event.ReturnFromPluginEvent
 import org.wycliffeassociates.otter.jvm.controls.event.TakeAction
 import org.wycliffeassociates.otter.jvm.controls.event.UndoChunkingPageEvent
 import org.wycliffeassociates.otter.jvm.utils.ListenerDisposer
@@ -269,6 +270,10 @@ class BlindDraft : View() {
                 workspace.dock(pluginOpenedPage)
             }
         }.let { eventSubscriptions.add(it) }
+
+        subscribe<ReturnFromPluginEvent> {
+            viewModel.pluginOpenedProperty.set(false)
+        }.let { eventSubscriptions.add(it) }
     }
 
     private fun unsubscribeEvents() {